diff options
| author | Melanie | 2010-11-25 01:24:32 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-25 01:24:32 +0000 |
| commit | 2c1c04119d11a98cd847c6a86afc8a6e3d6bbe33 (patch) | |
| tree | 03e8cf7dbc1b11b424b238b6362a360ac176dbe8 /OpenSim/Data | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Implement the restart module (diff) | |
| download | opensim-SC-2c1c04119d11a98cd847c6a86afc8a6e3d6bbe33.zip opensim-SC-2c1c04119d11a98cd847c6a86afc8a6e3d6bbe33.tar.gz opensim-SC-2c1c04119d11a98cd847c6a86afc8a6e3d6bbe33.tar.bz2 opensim-SC-2c1c04119d11a98cd847c6a86afc8a6e3d6bbe33.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -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] |