diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/CachedUserInfo.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index ceca1a4..6a7b6b7 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -35,7 +35,8 @@ using log4net; | |||
35 | 35 | ||
36 | namespace OpenSim.Framework.Communications.Cache | 36 | namespace OpenSim.Framework.Communications.Cache |
37 | { | 37 | { |
38 | internal delegate void CreateFolderDelegate(string folderName, LLUUID folderID, ushort folderType, LLUUID parentID); | 38 | //internal delegate void DeleteItemDelegate( |
39 | internal delegate void CreateFolderDelegate(string folderName, LLUUID folderID, ushort folderType, LLUUID parentID); | ||
39 | internal delegate void MoveFolderDelegate(LLUUID folderID, LLUUID parentID); | 40 | internal delegate void MoveFolderDelegate(LLUUID folderID, LLUUID parentID); |
40 | internal delegate void PurgeFolderDelegate(LLUUID folderID); | 41 | internal delegate void PurgeFolderDelegate(LLUUID folderID); |
41 | internal delegate void UpdateFolderDelegate(string name, LLUUID folderID, ushort type, LLUUID parentID); | 42 | internal delegate void UpdateFolderDelegate(string name, LLUUID folderID, ushort type, LLUUID parentID); |
@@ -234,7 +235,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
234 | } | 235 | } |
235 | else | 236 | else |
236 | { | 237 | { |
237 | InventoryFolderImpl folder = RootFolder.GetDescendentFolder(folderInfo.ParentID); | 238 | InventoryFolderImpl folder = RootFolder.FindFolder(folderInfo.ParentID); |
238 | lock (folder.SubFolders) | 239 | lock (folder.SubFolders) |
239 | { | 240 | { |
240 | if (folder != null) | 241 | if (folder != null) |
@@ -275,7 +276,6 @@ namespace OpenSim.Framework.Communications.Cache | |||
275 | { | 276 | { |
276 | if (!RootFolder.Items.ContainsKey(itemInfo.ID)) | 277 | if (!RootFolder.Items.ContainsKey(itemInfo.ID)) |
277 | { | 278 | { |
278 | |||
279 | RootFolder.Items.Add(itemInfo.ID, itemInfo); | 279 | RootFolder.Items.Add(itemInfo.ID, itemInfo); |
280 | } | 280 | } |
281 | else | 281 | else |
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
286 | } | 286 | } |
287 | else | 287 | else |
288 | { | 288 | { |
289 | InventoryFolderImpl folder = RootFolder.GetDescendentFolder(itemInfo.Folder); | 289 | InventoryFolderImpl folder = RootFolder.FindFolder(itemInfo.Folder); |
290 | if (folder != null) | 290 | if (folder != null) |
291 | { | 291 | { |
292 | lock (folder.Items) | 292 | lock (folder.Items) |
@@ -346,7 +346,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
346 | } | 346 | } |
347 | else | 347 | else |
348 | { | 348 | { |
349 | InventoryFolderImpl folder = RootFolder.GetDescendentFolder(parentID); | 349 | InventoryFolderImpl folder = RootFolder.FindFolder(parentID); |
350 | 350 | ||
351 | if (folder != null) | 351 | if (folder != null) |
352 | { | 352 | { |
@@ -479,7 +479,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
479 | 479 | ||
480 | if (HasInventory) | 480 | if (HasInventory) |
481 | { | 481 | { |
482 | InventoryFolderImpl purgedFolder = RootFolder.GetDescendentFolder(folderID); | 482 | InventoryFolderImpl purgedFolder = RootFolder.FindFolder(folderID); |
483 | 483 | ||
484 | if (purgedFolder != null) | 484 | if (purgedFolder != null) |
485 | { | 485 | { |