aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs2
-rw-r--r--OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs6
-rw-r--r--OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs2
-rw-r--r--OpenSim/Services/Interfaces/IInventoryService.cs3
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs10
8 files changed, 18 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index d637ef0..4070b49 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -497,7 +497,7 @@ namespace OpenSim.Framework.Communications.Tests
497 { 497 {
498 } 498 }
499 499
500 public List<InventoryItemBase> GetFolderItems(UUID folderID) 500 public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
501 { 501 {
502 return null; 502 return null;
503 } 503 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs
index 4d741a9..ac2eaed 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/HGInventoryBroker.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
196 } 196 }
197 } 197 }
198 198
199 public List<InventoryItemBase> GetFolderItems(UUID folderID) 199 public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
200 { 200 {
201 return new List<InventoryItemBase>(); 201 return new List<InventoryItemBase>();
202 } 202 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
index ce64d4d..69a37a9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/LocalInventoryServiceConnector.cs
@@ -170,9 +170,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
170 m_InventoryService.GetUserInventory(userID, callback); 170 m_InventoryService.GetUserInventory(userID, callback);
171 } 171 }
172 172
173 public List<InventoryItemBase> GetFolderItems(UUID folderID) 173 public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
174 { 174 {
175 return m_InventoryService.GetFolderItems(folderID); 175 return m_InventoryService.GetFolderItems(userID, folderID);
176 } 176 }
177 177
178 /// <summary> 178 /// <summary>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
index cd13c3d..5a31f23 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Inventory/RemoteInventoryServiceConnector.cs
@@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Inventory
163 163
164 } 164 }
165 165
166 public List<InventoryItemBase> GetFolderItems(UUID folderID) 166 public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
167 { 167 {
168 return new List<InventoryItemBase>(); 168 return new List<InventoryItemBase>();
169 } 169 }
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index 3e3064a..3354b84 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -159,7 +159,11 @@ namespace OpenSim.Server.Handlers.Inventory
159 { 159 {
160 List<InventoryItemBase> allItems = new List<InventoryItemBase>(); 160 List<InventoryItemBase> allItems = new List<InventoryItemBase>();
161 161
162 List<InventoryItemBase> items = m_InventoryService.GetFolderItems(new UUID(folderID)); 162 // TODO: UUID.Zero is passed as the userID here, making the old assumption that the OpenSim
163 // inventory server only has a single inventory database and not per-user inventory databases.
164 // This could be changed but it requirs a bit of hackery to pass another parameter into this
165 // callback
166 List<InventoryItemBase> items = m_InventoryService.GetFolderItems(UUID.Zero, new UUID(folderID));
163 167
164 if (items != null) 168 if (items != null)
165 { 169 {
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
index 3264f41..fbb2707 100644
--- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Services.Connectors
106 { 106 {
107 } 107 }
108 108
109 public List<InventoryItemBase> GetFolderItems(UUID folderID) 109 public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
110 { 110 {
111 return null; 111 return null;
112 } 112 }
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index 8757744..15da3cb 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -72,9 +72,10 @@ namespace OpenSim.Services.Interfaces
72 /// <summary> 72 /// <summary>
73 /// Gets the items inside a folder 73 /// Gets the items inside a folder
74 /// </summary> 74 /// </summary>
75 /// <param name="userID"></param>
75 /// <param name="folderID"></param> 76 /// <param name="folderID"></param>
76 /// <returns></returns> 77 /// <returns></returns>
77 List<InventoryItemBase> GetFolderItems(UUID folderID); 78 List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID);
78 79
79 /// <summary> 80 /// <summary>
80 /// Add a new folder to the user's inventory 81 /// Add a new folder to the user's inventory
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 {