diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index e5d8895..830c877 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | |||
| @@ -133,7 +133,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
| 133 | 133 | ||
| 134 | timedOut = true; | 134 | timedOut = true; |
| 135 | lock (this) | 135 | lock (this) |
| 136 | { | 136 | { |
| 137 | UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); | 137 | UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); |
| 138 | Monitor.Wait(this, 60000); | 138 | Monitor.Wait(this, 60000); |
| 139 | } | 139 | } |
| @@ -150,7 +150,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
| 150 | CachedUserInfo userInfo; | 150 | CachedUserInfo userInfo; |
| 151 | 151 | ||
| 152 | lock (this) | 152 | lock (this) |
| 153 | { | 153 | { |
| 154 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); | 154 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); |
| 155 | Monitor.Wait(this, 60000); | 155 | Monitor.Wait(this, 60000); |
| 156 | } | 156 | } |
| @@ -171,7 +171,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
| 171 | CachedUserInfo userInfo; | 171 | CachedUserInfo userInfo; |
| 172 | 172 | ||
| 173 | lock (this) | 173 | lock (this) |
| 174 | { | 174 | { |
| 175 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); | 175 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); |
| 176 | Monitor.Wait(this, 60000); | 176 | Monitor.Wait(this, 60000); |
| 177 | } | 177 | } |
| @@ -206,7 +206,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
| 206 | CachedUserInfo userInfo; | 206 | CachedUserInfo userInfo; |
| 207 | 207 | ||
| 208 | lock (this) | 208 | lock (this) |
| 209 | { | 209 | { |
| 210 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); | 210 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); |
| 211 | Monitor.Wait(this, 60000); | 211 | Monitor.Wait(this, 60000); |
| 212 | } | 212 | } |
| @@ -271,7 +271,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
| 271 | CachedUserInfo userInfo; | 271 | CachedUserInfo userInfo; |
| 272 | 272 | ||
| 273 | lock (this) | 273 | lock (this) |
| 274 | { | 274 | { |
| 275 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); | 275 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); |
| 276 | Monitor.Wait(this, 60000); | 276 | Monitor.Wait(this, 60000); |
| 277 | } | 277 | } |
| @@ -311,7 +311,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
| 311 | CachedUserInfo userInfo; | 311 | CachedUserInfo userInfo; |
| 312 | 312 | ||
| 313 | lock (this) | 313 | lock (this) |
| 314 | { | 314 | { |
| 315 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); | 315 | userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager, InventoryReceived); |
| 316 | Monitor.Wait(this, 60000); | 316 | Monitor.Wait(this, 60000); |
| 317 | } | 317 | } |