diff options
| author | dr scofield (aka dirk husemann) | 2009-09-02 09:43:22 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-09-02 11:06:18 +0200 |
| commit | 05756e1fb96aa47f9ff111dd04499934c7077731 (patch) | |
| tree | 063fa95f8d445cc53c32c607e7e8d3778f1f14a9 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC-05756e1fb96aa47f9ff111dd04499934c7077731.zip opensim-SC-05756e1fb96aa47f9ff111dd04499934c7077731.tar.gz opensim-SC-05756e1fb96aa47f9ff111dd04499934c7077731.tar.bz2 opensim-SC-05756e1fb96aa47f9ff111dd04499934c7077731.tar.xz | |
warnings safari.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 1696d82..066c5d3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
| @@ -93,13 +93,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 93 | string userFirstName = "Jock"; | 93 | string userFirstName = "Jock"; |
| 94 | string userLastName = "Stirrup"; | 94 | string userLastName = "Stirrup"; |
| 95 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); | 95 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); |
| 96 | CachedUserInfo userInfo; | 96 | // CachedUserInfo userInfo; |
| 97 | 97 | ||
| 98 | lock (this) | 98 | lock (this) |
| 99 | { | 99 | { |
| 100 | userInfo | 100 | UserProfileTestUtils.CreateUserWithInventory( |
| 101 | = UserProfileTestUtils.CreateUserWithInventory( | 101 | cm, userFirstName, userLastName, userId, InventoryReceived); |
| 102 | cm, userFirstName, userLastName, userId, InventoryReceived); | ||
| 103 | Monitor.Wait(this, 60000); | 102 | Monitor.Wait(this, 60000); |
| 104 | } | 103 | } |
| 105 | 104 | ||