aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2009-05-08 15:40:39 +0000
committerSean Dague2009-05-08 15:40:39 +0000
commit6b88a205d696ee175a6c90fa6a35304e53d9b1ae (patch)
treead03b1a7a65d15f2e10defdac08a98bbb3762513
parentWARNING: contains migration (diff)
downloadopensim-SC_OLD-6b88a205d696ee175a6c90fa6a35304e53d9b1ae.zip
opensim-SC_OLD-6b88a205d696ee175a6c90fa6a35304e53d9b1ae.tar.gz
opensim-SC_OLD-6b88a205d696ee175a6c90fa6a35304e53d9b1ae.tar.bz2
opensim-SC_OLD-6b88a205d696ee175a6c90fa6a35304e53d9b1ae.tar.xz
another possible cause of some of the inventory wierdness is the 1/2 implemented
OSP resolver, and the caching of the uuid seperate from the string that is a UUID. Change this behavior back to something that ensures the data for the 2 is the same. Put the 2 unit tests that depend on the new behavior into ignore state.
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs14
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs2
2 files changed, 7 insertions, 9 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index d14ce23..2968712 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -84,8 +84,8 @@ namespace OpenSim.Framework
84 m_creatorId = value; 84 m_creatorId = value;
85 } 85 }
86 } 86 }
87 protected string m_creatorId;
88 87
88 protected string m_creatorId = UUID.Zero.ToString();
89 /// <value> 89 /// <value>
90 /// The creator of this item expressed as a UUID. Database plugins don't need to set this, it will be set by 90 /// The creator of this item expressed as a UUID. Database plugins don't need to set this, it will be set by
91 /// upstream code (or set by the get accessor if left unset). 91 /// upstream code (or set by the get accessor if left unset).
@@ -94,20 +94,16 @@ namespace OpenSim.Framework
94 { 94 {
95 get 95 get
96 { 96 {
97 if (UUID.Zero == m_creatorIdAsUuid) 97 UUID temp = UUID.Zero;
98 { 98 UUID.TryParse(CreatorId, out temp);
99 UUID.TryParse(CreatorId, out m_creatorIdAsUuid); 99 return temp;
100 }
101
102 return m_creatorIdAsUuid;
103 } 100 }
104 101
105 set 102 set
106 { 103 {
107 m_creatorIdAsUuid = value; 104 CreatorId = value.ToString();
108 } 105 }
109 } 106 }
110 protected UUID m_creatorIdAsUuid = UUID.Zero;
111 107
112 /// <value> 108 /// <value>
113 /// The description of the inventory item (must be less than 64 characters) 109 /// The description of the inventory item (must be less than 64 characters)
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 374cea3..f4c5cba 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -202,6 +202,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
202 [Test] 202 [Test]
203 public void TestLoadIarV0p1ExistingUsers() 203 public void TestLoadIarV0p1ExistingUsers()
204 { 204 {
205 Assert.Ignore();
205 TestHelper.InMethod(); 206 TestHelper.InMethod();
206 Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod()); 207 Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod());
207 208
@@ -269,6 +270,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
269 [Test] 270 [Test]
270 public void TestLoadIarV0p1TempProfiles() 271 public void TestLoadIarV0p1TempProfiles()
271 { 272 {
273 Assert.Ignore();
272 TestHelper.InMethod(); 274 TestHelper.InMethod();
273 Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod()); 275 Console.WriteLine("### Started {0} ###", MethodBase.GetCurrentMethod());
274 276