aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/InventoryService
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 1190b38..86a903c 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Services.InventoryService
150 150
151 foreach (InventoryFolderBase folder in allFolders) 151 foreach (InventoryFolderBase folder in allFolders)
152 { 152 {
153 List<InventoryItemBase> items = GetFolderItems(folder.ID); 153 List<InventoryItemBase> items = GetFolderItems(userID, folder.ID);
154 154
155 if (items != null) 155 if (items != null)
156 { 156 {
@@ -205,7 +205,7 @@ namespace OpenSim.Services.InventoryService
205 { 205 {
206 rootFolder = new InventoryFolderImpl(folder); 206 rootFolder = new InventoryFolderImpl(folder);
207 folders.Add(rootFolder); 207 folders.Add(rootFolder);
208 items.AddRange(GetFolderItems(rootFolder.ID)); 208 items.AddRange(GetFolderItems(userID, rootFolder.ID));
209 break; // Only 1 root folder per user 209 break; // Only 1 root folder per user
210 } 210 }
211 } 211 }
@@ -217,7 +217,7 @@ namespace OpenSim.Services.InventoryService
217 if (folder.ID != rootFolder.ID) 217 if (folder.ID != rootFolder.ID)
218 { 218 {
219 folders.Add(new InventoryFolderImpl(folder)); 219 folders.Add(new InventoryFolderImpl(folder));
220 items.AddRange(GetFolderItems(folder.ID)); 220 items.AddRange(GetFolderItems(userID, folder.ID));
221 } 221 }
222 } 222 }
223 } 223 }
@@ -255,7 +255,7 @@ namespace OpenSim.Services.InventoryService
255 return inventoryList; 255 return inventoryList;
256 } 256 }
257 257
258 public List<InventoryItemBase> GetFolderItems(UUID folderID) 258 public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
259 { 259 {
260 List<InventoryItemBase> itemsList = new List<InventoryItemBase>(); 260 List<InventoryItemBase> itemsList = new List<InventoryItemBase>();
261 261
@@ -377,7 +377,7 @@ namespace OpenSim.Services.InventoryService
377 m_Database.deleteInventoryFolder(subFolder.ID); 377 m_Database.deleteInventoryFolder(subFolder.ID);
378 } 378 }
379 379
380 List<InventoryItemBase> items = GetFolderItems(folder.ID); 380 List<InventoryItemBase> items = GetFolderItems(folder.Owner, folder.ID);
381 381
382 foreach (InventoryItemBase item in items) 382 foreach (InventoryItemBase item in items)
383 { 383 {