diff options
| author | Justin Clark-Casey (justincc) | 2011-03-09 01:21:31 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-03-09 01:21:31 +0000 |
| commit | 8a2360bf815d4d78fcff34a69dec24782494bd2e (patch) | |
| tree | 51c8413aa9263831330273dce964421bc0dd8fb5 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |
| parent | Make -m shortcut option for --merge on load iar specific. Correct some log m... (diff) | |
| download | opensim-SC_OLD-8a2360bf815d4d78fcff34a69dec24782494bd2e.zip opensim-SC_OLD-8a2360bf815d4d78fcff34a69dec24782494bd2e.tar.gz opensim-SC_OLD-8a2360bf815d4d78fcff34a69dec24782494bd2e.tar.bz2 opensim-SC_OLD-8a2360bf815d4d78fcff34a69dec24782494bd2e.tar.xz | |
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 6030706..7849d88 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
| @@ -400,6 +400,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 400 | UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.UserAccountService); | 400 | UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.UserAccountService); |
| 401 | if (UUID.Zero != ospResolvedId) // The user exists in this grid | 401 | if (UUID.Zero != ospResolvedId) // The user exists in this grid |
| 402 | { | 402 | { |
| 403 | // m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId); | ||
| 404 | |||
| 403 | item.CreatorIdAsUuid = ospResolvedId; | 405 | item.CreatorIdAsUuid = ospResolvedId; |
| 404 | 406 | ||
| 405 | // XXX: For now, don't preserve the OSPA in the creator id (which actually gets persisted to the | 407 | // XXX: For now, don't preserve the OSPA in the creator id (which actually gets persisted to the |