diff options
| author | Melanie | 2010-11-27 01:08:12 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-27 01:08:12 +0000 |
| commit | e05f728b084d66de964b8d7fa0a9318b94526c4e (patch) | |
| tree | 43feb59eae181a09e3a35c4f6a961e3cd8ad2352 /OpenSim/Data | |
| parent | Convert the scope id in the im session id to a URL variable. Fixes offline (diff) | |
| parent | llVecNorm nant test (diff) | |
| download | opensim-SC_OLD-e05f728b084d66de964b8d7fa0a9318b94526c4e.zip opensim-SC_OLD-e05f728b084d66de964b8d7fa0a9318b94526c4e.tar.gz opensim-SC_OLD-e05f728b084d66de964b8d7fa0a9318b94526c4e.tar.bz2 opensim-SC_OLD-e05f728b084d66de964b8d7fa0a9318b94526c4e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -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 | ||