OSDN Git Service

Avoid using UUID type in designer controls, xbuild pukes on it.
authorLatif Khalifa <latifer@streamgrid.net>
Wed, 21 Apr 2010 13:19:08 +0000 (13:19 +0000)
committerLatif Khalifa <latifer@streamgrid.net>
Wed, 21 Apr 2010 13:19:08 +0000 (13:19 +0000)
git-svn-id: https://radegast.googlecode.com/svn/trunk@570 f7a694da-4d33-11de-9ad6-1127a62b9fcd

Radegast/Core/Types/AgentNameTextBox.cs
Radegast/GUI/Consoles/Inventory/InventoryConsole.Designer.cs
Radegast/GUI/Consoles/Inventory/InventoryConsole.resx
Radegast/GUI/Consoles/ObjectsConsole.Designer.cs
Radegast/GUI/Consoles/ObjectsConsole.resx
Radegast/GUI/Dialogs/Profile.Designer.cs
Radegast/GUI/Dialogs/Profile.resx

index ec0296a..470db86 100644 (file)
@@ -31,6 +31,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using System.ComponentModel;
 using OpenMetaverse;
 
 namespace Radegast
@@ -41,7 +42,7 @@ namespace Radegast
         private GridClient client { get { return RadegastInstance.GlobalInstance.Client; } }
         private RadegastInstance instance { get { return RadegastInstance.GlobalInstance; } }
 
-        [System.ComponentModel.Browsable(false)]
+        [Browsable(false), DesignOnly(true)]
         public UUID AgentID
         {
             get { return agentID; }
index d1c0bc5..945b790 100644 (file)
@@ -302,7 +302,6 @@ namespace Radegast
             // 
             // txtCreator
             // 
-            this.txtCreator.AgentID = ((OpenMetaverse.UUID)(resources.GetObject("txtCreator.AgentID")));
             this.txtCreator.BackColor = System.Drawing.SystemColors.Window;
             this.txtCreator.Location = new System.Drawing.Point(80, 36);
             this.txtCreator.Name = "txtCreator";
index e49d49a..2e5b3a1 100644 (file)
         KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC\r
 </value>\r
   </data>\r
-  <data name="txtCreator.AgentID" mimetype="application/x-microsoft.net.object.binary.base64">\r
-    <value>\r
-        AAEAAAD/////AQAAAAAAAAAMAgAAAElPcGVuTWV0YXZlcnNlVHlwZXMsIFZlcnNpb249MC4wLjAuMCwg\r
-        Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBQEAAAAST3Blbk1ldGF2ZXJzZS5VVUlE\r
-        AQAAAARHdWlkAwtTeXN0ZW0uR3VpZAIAAAAE/f///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2ICX2MCX2QC\r
-        X2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICAAAAAAAAAAAAAAAAAAAAAAs=\r
-</value>\r
-  </data>\r
 </root>
\ No newline at end of file
index 88fda16..b6c807f 100644 (file)
@@ -484,7 +484,6 @@ namespace Radegast
             // 
             // txtCreator
             // 
-            this.txtCreator.AgentID = ((OpenMetaverse.UUID)(resources.GetObject("txtCreator.AgentID")));
             this.txtCreator.BackColor = System.Drawing.SystemColors.Window;
             this.txtCreator.Location = new System.Drawing.Point(61, 116);
             this.txtCreator.Name = "txtCreator";
@@ -494,7 +493,6 @@ namespace Radegast
             // 
             // txtOwner
             // 
-            this.txtOwner.AgentID = ((OpenMetaverse.UUID)(resources.GetObject("txtOwner.AgentID")));
             this.txtOwner.BackColor = System.Drawing.SystemColors.Window;
             this.txtOwner.Location = new System.Drawing.Point(61, 91);
             this.txtOwner.Name = "txtOwner";
index 80f5e42..03a568d 100644 (file)
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
+  <data name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
     <value>157, 17</value>\r
-  </metadata>\r
-  <data name="txtCreator.AgentID" mimetype="application/x-microsoft.net.object.binary.base64">\r
-    <value>\r
-        AAEAAAD/////AQAAAAAAAAAMAgAAAElPcGVuTWV0YXZlcnNlVHlwZXMsIFZlcnNpb249MC4wLjAuMCwg\r
-        Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBQEAAAAST3Blbk1ldGF2ZXJzZS5VVUlE\r
-        AQAAAARHdWlkAwtTeXN0ZW0uR3VpZAIAAAAE/f///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2ICX2MCX2QC\r
-        X2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICAAAAAAAAAAAAAAAAAAAAAAs=\r
-</value>\r
   </data>\r
-  <data name="txtOwner.AgentID" mimetype="application/x-microsoft.net.object.binary.base64">\r
-    <value>\r
-        AAEAAAD/////AQAAAAAAAAAMAgAAAElPcGVuTWV0YXZlcnNlVHlwZXMsIFZlcnNpb249MC4wLjAuMCwg\r
-        Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBQEAAAAST3Blbk1ldGF2ZXJzZS5VVUlE\r
-        AQAAAARHdWlkAwtTeXN0ZW0uR3VpZAIAAAAE/f///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2ICX2MCX2QC\r
-        X2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICAAAAAAAAAAAAAAAAAAAAAAs=\r
-</value>\r
-  </data>\r
-  <metadata name="ctxContents.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+  <data name="ctxContents.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
     <value>362, 17</value>\r
-  </metadata>\r
-  <metadata name="ctxMenuObjects.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+  </data>\r
+  <data name="ctxMenuObjects.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
     <value>17, 17</value>\r
-  </metadata>\r
-  <metadata name="ctxopen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+  </data>\r
+  <data name="ctxopen.TrayLocation" type="System.Drawing.Point, System.Drawing">\r
     <value>267, 17</value>\r
-  </metadata>\r
+  </data>\r
 </root>
\ No newline at end of file
index ffb484a..d5ae927 100644 (file)
@@ -202,7 +202,6 @@ namespace Radegast
             // 
             // anPartner
             // 
-            this.anPartner.AgentID = ((OpenMetaverse.UUID)(resources.GetObject("anPartner.AgentID")));
             this.anPartner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.anPartner.Location = new System.Drawing.Point(306, 34);
             this.anPartner.Name = "anPartner";
index ea4f193..ae98d49 100644 (file)
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
-  <data name="anPartner.AgentID" mimetype="application/x-microsoft.net.object.binary.base64">\r
-    <value>\r
-        AAEAAAD/////AQAAAAAAAAAMAgAAAElPcGVuTWV0YXZlcnNlVHlwZXMsIFZlcnNpb249MC4wLjAuMCwg\r
-        Q3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBQEAAAAST3Blbk1ldGF2ZXJzZS5VVUlE\r
-        AQAAAARHdWlkAwtTeXN0ZW0uR3VpZAIAAAAE/f///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2ICX2MCX2QC\r
-        X2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICAAAAAAAAAAAAAAAAAAAAAAs=\r
-</value>\r
-  </data>\r
-  <metadata name="tbpPicks.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="tbpPicks.Locked" type="System.Boolean, mscorlib">\r
     <value>True</value>\r
-  </metadata>\r
+  </data>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r