aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs8
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs12
3 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 847909a..7902240 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Framework.Communications.Cache
229 } 229 }
230 else 230 else
231 { 231 {
232 InventoryFolderImpl folder = RootFolder.HasSubFolder(folderInfo.ParentID); 232 InventoryFolderImpl folder = RootFolder.GetDescendentFolder(folderInfo.ParentID);
233 lock (folder.SubFolders) 233 lock (folder.SubFolders)
234 { 234 {
235 if (folder != null) 235 if (folder != null)
@@ -283,7 +283,7 @@ namespace OpenSim.Framework.Communications.Cache
283 } 283 }
284 else 284 else
285 { 285 {
286 InventoryFolderImpl folder = RootFolder.HasSubFolder(itemInfo.Folder); 286 InventoryFolderImpl folder = RootFolder.GetDescendentFolder(itemInfo.Folder);
287 if (folder != null) 287 if (folder != null)
288 { 288 {
289 lock (folder.Items) 289 lock (folder.Items)
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index f55f323..4dcf755 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -168,10 +168,10 @@ namespace OpenSim.Framework.Communications.Cache
168 } 168 }
169 169
170 /// <summary> 170 /// <summary>
171 /// Does this folder contain the given subfolder? 171 /// Returns the folder requested if it exists as a descendent of this folder
172 /// </summary> 172 /// </summary>
173 /// <returns></returns> 173 /// <returns>The requested folder if it exists, null if it does not.</returns>
174 public InventoryFolderImpl HasSubFolder(LLUUID folderID) 174 public InventoryFolderImpl GetDescendentFolder(LLUUID folderID)
175 { 175 {
176 InventoryFolderImpl returnFolder = null; 176 InventoryFolderImpl returnFolder = null;
177 177
@@ -185,7 +185,7 @@ namespace OpenSim.Framework.Communications.Cache
185 { 185 {
186 foreach (InventoryFolderImpl folder in SubFolders.Values) 186 foreach (InventoryFolderImpl folder in SubFolders.Values)
187 { 187 {
188 returnFolder = folder.HasSubFolder(folderID); 188 returnFolder = folder.GetDescendentFolder(folderID);
189 if (returnFolder != null) 189 if (returnFolder != null)
190 { 190 {
191 break; 191 break;
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