aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorDiva Canto2009-08-11 14:52:17 -0700
committerDiva Canto2009-08-11 14:52:17 -0700
commit41839efcc56bd9436f5eb85e68abeba7f606af43 (patch)
treef76edb19123a8e331b00714caab7d1d8f8f4fa18 /OpenSim/Server/Handlers
parentRe-adding a conditional in UserManager that was removed with arthusv's commit... (diff)
downloadopensim-SC_OLD-41839efcc56bd9436f5eb85e68abeba7f606af43.zip
opensim-SC_OLD-41839efcc56bd9436f5eb85e68abeba7f606af43.tar.gz
opensim-SC_OLD-41839efcc56bd9436f5eb85e68abeba7f606af43.tar.bz2
opensim-SC_OLD-41839efcc56bd9436f5eb85e68abeba7f606af43.tar.xz
Some more hammering on the head of the obsolete rest inventory handlers, just to make this work.
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
index ae9546a..8d104ac 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerInConnector.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Server.Handlers.Inventory
85 "POST", "/GetInventory/", GetUserInventory, CheckAuthSession)); 85 "POST", "/GetInventory/", GetUserInventory, CheckAuthSession));
86 86
87 m_httpServer.AddStreamHandler( 87 m_httpServer.AddStreamHandler(
88 new RestDeserialiseSecureHandler<Guid, Dictionary<AssetType, InventoryFolderBase>>( 88 new RestDeserialiseSecureHandler<Guid, List<InventoryFolderBase>>(
89 "POST", "/SystemFolders/", GetSystemFolders, CheckAuthSession)); 89 "POST", "/SystemFolders/", GetSystemFolders, CheckAuthSession));
90 90
91 m_httpServer.AddStreamHandler( 91 m_httpServer.AddStreamHandler(
@@ -163,10 +163,10 @@ namespace OpenSim.Server.Handlers.Inventory
163 return m_InventoryService.GetUserInventory(userID); 163 return m_InventoryService.GetUserInventory(userID);
164 } 164 }
165 165
166 public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(Guid guid) 166 public List<InventoryFolderBase> GetSystemFolders(Guid guid)
167 { 167 {
168 UUID userID = new UUID(guid); 168 UUID userID = new UUID(guid);
169 return GetSystemFolders(userID); 169 return new List<InventoryFolderBase>(GetSystemFolders(userID).Values);
170 } 170 }
171 171
172 // This shouldn't be here, it should be in the inventory service. 172 // This shouldn't be here, it should be in the inventory service.