From 3508298ddf5df94574c37c04fd59c3df579e42a2 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 30 Apr 2008 20:04:06 +0000 Subject: * Refactor: Rename InventoryFolderImpl.HasSubFolder() to GetDescendentFolder() --- .../Communications/Cache/UserProfileCacheService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs') 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 } else { - InventoryFolderImpl folder = userProfile.RootFolder.HasSubFolder(parentID); + InventoryFolderImpl folder = userProfile.RootFolder.GetDescendentFolder(parentID); if (folder != null) { InventoryFolderImpl createdFolder = folder.CreateNewSubFolder(folderID, folderName, folderType); @@ -336,7 +336,7 @@ namespace OpenSim.Framework.Communications.Cache return; } - if ((fold = libraryRoot.HasSubFolder(folderID)) != null) + if ((fold = libraryRoot.GetDescendentFolder(folderID)) != null) { remoteClient.SendInventoryFolderDetails( libraryRoot.Owner, folderID, fold.RequestListOfItems(), @@ -385,7 +385,7 @@ namespace OpenSim.Framework.Communications.Cache } else { - if ((fold = userProfile.RootFolder.HasSubFolder(folderID)) != null) + if ((fold = userProfile.RootFolder.GetDescendentFolder(folderID)) != null) { // m_log.DebugFormat( // "[AGENT INVENTORY]: Found folder {0} for client {1}", @@ -446,7 +446,7 @@ namespace OpenSim.Framework.Communications.Cache return libraryRoot.RequestListOfItems(); } - if ((fold = libraryRoot.HasSubFolder(folderID)) != null) + if ((fold = libraryRoot.GetDescendentFolder(folderID)) != null) { return fold.RequestListOfItems(); } @@ -487,7 +487,7 @@ namespace OpenSim.Framework.Communications.Cache } else { - if ((fold = userProfile.RootFolder.HasSubFolder(folderID)) != null) + if ((fold = userProfile.RootFolder.GetDescendentFolder(folderID)) != null) { return fold.RequestListOfItems(); } @@ -533,7 +533,7 @@ namespace OpenSim.Framework.Communications.Cache { if (userProfile.HasInventory) { - InventoryFolderImpl purgedFolder = userProfile.RootFolder.HasSubFolder(folderID); + InventoryFolderImpl purgedFolder = userProfile.RootFolder.GetDescendentFolder(folderID); if (purgedFolder != null) { // XXX Nasty - have to create a new object to hold details we already have -- cgit v1.1