aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authordiva2009-06-11 20:27:13 +0000
committerdiva2009-06-11 20:27:13 +0000
commit2afd733229627b9ec59eb9a41e865a8d83d5d4c3 (patch)
tree24e0a5dda83b9a71268b23419c843aed7bf93220 /OpenSim/Region
parentSmall improvement in the IAR tests, but these tests are still showing random ... (diff)
downloadopensim-SC_OLD-2afd733229627b9ec59eb9a41e865a8d83d5d4c3.zip
opensim-SC_OLD-2afd733229627b9ec59eb9a41e865a8d83d5d4c3.tar.gz
opensim-SC_OLD-2afd733229627b9ec59eb9a41e865a8d83d5d4c3.tar.bz2
opensim-SC_OLD-2afd733229627b9ec59eb9a41e865a8d83d5d4c3.tar.xz
Fixes mantis #3803. Thanks jhurliman.
Diffstat (limited to 'OpenSim/Region')
-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
3 files changed, 4 insertions, 4 deletions
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 }