aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-11-23 07:50:04 -0800
committeropensim mirror account2010-11-23 07:50:04 -0800
commita1daeb277efc43cb63b97889d830e6cb8c60539c (patch)
tree0ceebb1a2c9954d8c4336b5b8ef160b04ee4e183
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentAttempt at fixing failing test. (diff)
downloadopensim-SC_OLD-a1daeb277efc43cb63b97889d830e6cb8c60539c.zip
opensim-SC_OLD-a1daeb277efc43cb63b97889d830e6cb8c60539c.tar.gz
opensim-SC_OLD-a1daeb277efc43cb63b97889d830e6cb8c60539c.tar.bz2
opensim-SC_OLD-a1daeb277efc43cb63b97889d830e6cb8c60539c.tar.xz
Merge branch 'master' of /var/git/opensim/
-rw-r--r--OpenSim/Data/Tests/InventoryTests.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index 3205bfa..dc03259 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -323,7 +323,8 @@ namespace OpenSim.Data.Tests
323 .IgnoreProperty(x => x.InvType) 323 .IgnoreProperty(x => x.InvType)
324 .IgnoreProperty(x => x.CreatorIdAsUuid) 324 .IgnoreProperty(x => x.CreatorIdAsUuid)
325 .IgnoreProperty(x => x.Description) 325 .IgnoreProperty(x => x.Description)
326 .IgnoreProperty(x => x.CreatorId)); 326 .IgnoreProperty(x => x.CreatorId)
327 .IgnoreProperty(x => x.CreatorData));
327 328
328 inventoryScrambler.Scramble(expected); 329 inventoryScrambler.Scramble(expected);
329 db.updateInventoryItem(expected); 330 db.updateInventoryItem(expected);
@@ -333,7 +334,8 @@ namespace OpenSim.Data.Tests
333 .IgnoreProperty(x => x.InvType) 334 .IgnoreProperty(x => x.InvType)
334 .IgnoreProperty(x => x.CreatorIdAsUuid) 335 .IgnoreProperty(x => x.CreatorIdAsUuid)
335 .IgnoreProperty(x => x.Description) 336 .IgnoreProperty(x => x.Description)
336 .IgnoreProperty(x => x.CreatorId)); 337 .IgnoreProperty(x => x.CreatorId)
338 .IgnoreProperty(x => x.CreatorData));
337 } 339 }
338 340
339 [Test] 341 [Test]