diff options
author | opensim mirror account | 2010-11-26 14:10:05 -0800 |
---|---|---|
committer | opensim mirror account | 2010-11-26 14:10:05 -0800 |
commit | f10aa2c887fbe14c0b93eb663a54c0c3987dfa53 (patch) | |
tree | 43b0bbe7c964c3c3a4c7fd9c91b98e7fa694475b | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
parent | Another attempt at fixing failing test for creator info. (diff) | |
download | opensim-SC-f10aa2c887fbe14c0b93eb663a54c0c3987dfa53.zip opensim-SC-f10aa2c887fbe14c0b93eb663a54c0c3987dfa53.tar.gz opensim-SC-f10aa2c887fbe14c0b93eb663a54c0c3987dfa53.tar.bz2 opensim-SC-f10aa2c887fbe14c0b93eb663a54c0c3987dfa53.tar.xz |
Merge branch 'master' of /var/git/opensim/
-rw-r--r-- | OpenSim/Data/Tests/InventoryTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs index dc03259..9c2a2d6 100644 --- a/OpenSim/Data/Tests/InventoryTests.cs +++ b/OpenSim/Data/Tests/InventoryTests.cs | |||
@@ -323,7 +323,7 @@ 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.CreatorIdentification) |
327 | .IgnoreProperty(x => x.CreatorData)); | 327 | .IgnoreProperty(x => x.CreatorData)); |
328 | 328 | ||
329 | inventoryScrambler.Scramble(expected); | 329 | inventoryScrambler.Scramble(expected); |
@@ -334,7 +334,7 @@ namespace OpenSim.Data.Tests | |||
334 | .IgnoreProperty(x => x.InvType) | 334 | .IgnoreProperty(x => x.InvType) |
335 | .IgnoreProperty(x => x.CreatorIdAsUuid) | 335 | .IgnoreProperty(x => x.CreatorIdAsUuid) |
336 | .IgnoreProperty(x => x.Description) | 336 | .IgnoreProperty(x => x.Description) |
337 | .IgnoreProperty(x => x.CreatorId) | 337 | .IgnoreProperty(x => x.CreatorIdentification) |
338 | .IgnoreProperty(x => x.CreatorData)); | 338 | .IgnoreProperty(x => x.CreatorData)); |
339 | } | 339 | } |
340 | 340 | ||