diff options
author | Justin Clarke Casey | 2008-04-30 20:04:06 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-30 20:04:06 +0000 |
commit | 3508298ddf5df94574c37c04fd59c3df579e42a2 (patch) | |
tree | d349fb812c895be2648aa55beac54bab7117eb24 /OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |
parent | * Resolve mantis 1068, 1095 (diff) | |
download | opensim-SC-3508298ddf5df94574c37c04fd59c3df579e42a2.zip opensim-SC-3508298ddf5df94574c37c04fd59c3df579e42a2.tar.gz opensim-SC-3508298ddf5df94574c37c04fd59c3df579e42a2.tar.bz2 opensim-SC-3508298ddf5df94574c37c04fd59c3df579e42a2.tar.xz |
* Refactor: Rename InventoryFolderImpl.HasSubFolder() to GetDescendentFolder()
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 4627f75..049b4a1 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -193,7 +193,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
193 | } | 193 | } |
194 | else | 194 | else |
195 | { | 195 | { |
196 | InventoryFolderImpl folder = userProfile.RootFolder.HasSubFolder(parentID); | 196 | InventoryFolderImpl folder = userProfile.RootFolder.GetDescendentFolder(parentID); |
197 | if (folder != null) | 197 | if (folder != null) |
198 | { | 198 | { |
199 | InventoryFolderImpl createdFolder = folder.CreateNewSubFolder(folderID, folderName, folderType); | 199 | InventoryFolderImpl createdFolder = folder.CreateNewSubFolder(folderID, folderName, folderType); |
@@ -336,7 +336,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
336 | return; | 336 | return; |
337 | } | 337 | } |
338 | 338 | ||
339 | if ((fold = libraryRoot.HasSubFolder(folderID)) != null) | 339 | if ((fold = libraryRoot.GetDescendentFolder(folderID)) != null) |
340 | { | 340 | { |
341 | remoteClient.SendInventoryFolderDetails( | 341 | remoteClient.SendInventoryFolderDetails( |
342 | libraryRoot.Owner, folderID, fold.RequestListOfItems(), | 342 | libraryRoot.Owner, folderID, fold.RequestListOfItems(), |
@@ -385,7 +385,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
385 | } | 385 | } |
386 | else | 386 | else |
387 | { | 387 | { |
388 | if ((fold = userProfile.RootFolder.HasSubFolder(folderID)) != null) | 388 | if ((fold = userProfile.RootFolder.GetDescendentFolder(folderID)) != null) |
389 | { | 389 | { |
390 | // m_log.DebugFormat( | 390 | // m_log.DebugFormat( |
391 | // "[AGENT INVENTORY]: Found folder {0} for client {1}", | 391 | // "[AGENT INVENTORY]: Found folder {0} for client {1}", |
@@ -446,7 +446,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
446 | return libraryRoot.RequestListOfItems(); | 446 | return libraryRoot.RequestListOfItems(); |
447 | } | 447 | } |
448 | 448 | ||
449 | if ((fold = libraryRoot.HasSubFolder(folderID)) != null) | 449 | if ((fold = libraryRoot.GetDescendentFolder(folderID)) != null) |
450 | { | 450 | { |
451 | return fold.RequestListOfItems(); | 451 | return fold.RequestListOfItems(); |
452 | } | 452 | } |
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
487 | } | 487 | } |
488 | else | 488 | else |
489 | { | 489 | { |
490 | if ((fold = userProfile.RootFolder.HasSubFolder(folderID)) != null) | 490 | if ((fold = userProfile.RootFolder.GetDescendentFolder(folderID)) != null) |
491 | { | 491 | { |
492 | return fold.RequestListOfItems(); | 492 | return fold.RequestListOfItems(); |
493 | } | 493 | } |
@@ -533,7 +533,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
533 | { | 533 | { |
534 | if (userProfile.HasInventory) | 534 | if (userProfile.HasInventory) |
535 | { | 535 | { |
536 | InventoryFolderImpl purgedFolder = userProfile.RootFolder.HasSubFolder(folderID); | 536 | InventoryFolderImpl purgedFolder = userProfile.RootFolder.GetDescendentFolder(folderID); |
537 | if (purgedFolder != null) | 537 | if (purgedFolder != null) |
538 | { | 538 | { |
539 | // XXX Nasty - have to create a new object to hold details we already have | 539 | // XXX Nasty - have to create a new object to hold details we already have |