diff options
| author | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-23 22:27:54 -0800 |
| commit | bc51dfc45eb73e34d91fd72d0a537ffc907a9da6 (patch) | |
| tree | 084062cd82e16edbff08a5e3b705458d915caf86 /OpenSim/Data/Tests/InventoryTests.cs | |
| parent | Merge branch 'master-core' into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.zip opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.gz opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.bz2 opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Data/Tests/InventoryTests.cs')
| -rw-r--r-- | OpenSim/Data/Tests/InventoryTests.cs | 6 |
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] |