diff options
author | Justin Clarke Casey | 2008-07-31 16:05:50 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-31 16:05:50 +0000 |
commit | 078643a017cd94dce2d16e4c8db3cc18fd95ed9d (patch) | |
tree | 4c504cc6afdc1ca72dd134c64a8374e4d015cfb0 /OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |
parent | * minor: reduce coupling by passing in only session id to CachedUserInfo (diff) | |
download | opensim-SC-078643a017cd94dce2d16e4c8db3cc18fd95ed9d.zip opensim-SC-078643a017cd94dce2d16e4c8db3cc18fd95ed9d.tar.gz opensim-SC-078643a017cd94dce2d16e4c8db3cc18fd95ed9d.tar.bz2 opensim-SC-078643a017cd94dce2d16e4c8db3cc18fd95ed9d.tar.xz |
* refactor: Change CachedUserInfo.HasInventory to HasReceivedInventory to make actual function clearer
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 5f98c08..ac52535 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -348,7 +348,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
348 | // This is a crude way of dealing with that by retrying the lookup. It's not quite as bad | 348 | // This is a crude way of dealing with that by retrying the lookup. It's not quite as bad |
349 | // in CAPS as doing this with the udp request, since here it won't hold up other packets. | 349 | // in CAPS as doing this with the udp request, since here it won't hold up other packets. |
350 | // In fact, here we'll be generous and try for longer. | 350 | // In fact, here we'll be generous and try for longer. |
351 | if (!userProfile.HasInventory) | 351 | if (!userProfile.HasReceivedInventory) |
352 | { | 352 | { |
353 | int attempts = 0; | 353 | int attempts = 0; |
354 | while (attempts++ < 30) | 354 | while (attempts++ < 30) |
@@ -359,14 +359,14 @@ namespace OpenSim.Framework.Communications.Cache | |||
359 | 359 | ||
360 | Thread.Sleep(2000); | 360 | Thread.Sleep(2000); |
361 | 361 | ||
362 | if (userProfile.HasInventory) | 362 | if (userProfile.HasReceivedInventory) |
363 | { | 363 | { |
364 | break; | 364 | break; |
365 | } | 365 | } |
366 | } | 366 | } |
367 | } | 367 | } |
368 | 368 | ||
369 | if (userProfile.HasInventory) | 369 | if (userProfile.HasReceivedInventory) |
370 | { | 370 | { |
371 | if ((fold = userProfile.RootFolder.FindFolder(folderID)) != null) | 371 | if ((fold = userProfile.RootFolder.FindFolder(folderID)) != null) |
372 | { | 372 | { |
@@ -434,7 +434,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
434 | CachedUserInfo userProfile; | 434 | CachedUserInfo userProfile; |
435 | if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile)) | 435 | if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile)) |
436 | { | 436 | { |
437 | if (userProfile.HasInventory) | 437 | if (userProfile.HasReceivedInventory) |
438 | { | 438 | { |
439 | InventoryItemBase item = userProfile.RootFolder.FindItem(itemID); | 439 | InventoryItemBase item = userProfile.RootFolder.FindItem(itemID); |
440 | if (item != null) | 440 | if (item != null) |