aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSean Dague2009-05-08 15:40:39 +0000
committerSean Dague2009-05-08 15:40:39 +0000
commit6b88a205d696ee175a6c90fa6a35304e53d9b1ae (patch)
treead03b1a7a65d15f2e10defdac08a98bbb3762513 /OpenSim/Region
parentWARNING: contains migration (diff)
downloadopensim-SC-6b88a205d696ee175a6c90fa6a35304e53d9b1ae.zip
opensim-SC-6b88a205d696ee175a6c90fa6a35304e53d9b1ae.tar.gz
opensim-SC-6b88a205d696ee175a6c90fa6a35304e53d9b1ae.tar.bz2
opensim-SC-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.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs2
1 files changed, 2 insertions, 0 deletions
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