aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authordiva2009-06-11 20:27:13 +0000
committerdiva2009-06-11 20:27:13 +0000
commit2afd733229627b9ec59eb9a41e865a8d83d5d4c3 (patch)
tree24e0a5dda83b9a71268b23419c843aed7bf93220 /OpenSim/Server
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/Server')
-rw-r--r--OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs6
1 files changed, 5 insertions, 1 deletions
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 {