diff options
| author | Diva Canto | 2009-08-11 14:52:17 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-11 14:52:17 -0700 |
| commit | 41839efcc56bd9436f5eb85e68abeba7f606af43 (patch) | |
| tree | f76edb19123a8e331b00714caab7d1d8f8f4fa18 /OpenSim/Services | |
| parent | Re-adding a conditional in UserManager that was removed with arthusv's commit... (diff) | |
| download | opensim-SC-41839efcc56bd9436f5eb85e68abeba7f606af43.zip opensim-SC-41839efcc56bd9436f5eb85e68abeba7f606af43.tar.gz opensim-SC-41839efcc56bd9436f5eb85e68abeba7f606af43.tar.bz2 opensim-SC-41839efcc56bd9436f5eb85e68abeba7f606af43.tar.xz | |
Some more hammering on the head of the obsolete rest inventory handlers, just to make this work.
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index 5fb4815..2244a7e 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | |||
| @@ -164,16 +164,20 @@ namespace OpenSim.Services.Connectors | |||
| 164 | public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID) | 164 | public Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID) |
| 165 | { | 165 | { |
| 166 | // !!! Not just yet. | 166 | // !!! Not just yet. |
| 167 | //try | 167 | try |
| 168 | //{ | 168 | { |
| 169 | // return SynchronousRestSessionObjectPoster<Guid, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject( | 169 | List<InventoryFolderBase> folders = SynchronousRestSessionObjectPoster<Guid, List<InventoryFolderBase>>.BeginPostObject( |
| 170 | // "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); | 170 | "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); |
| 171 | //} | 171 | Dictionary<AssetType, InventoryFolderBase> dFolders = new Dictionary<AssetType, InventoryFolderBase>(); |
| 172 | //catch (Exception e) | 172 | foreach (InventoryFolderBase f in folders) |
| 173 | //{ | 173 | dFolders[(AssetType)f.Type] = f; |
| 174 | // m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}", | 174 | return dFolders; |
| 175 | // e.Source, e.Message); | 175 | } |
| 176 | //} | 176 | catch (Exception e) |
| 177 | { | ||
| 178 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}", | ||
| 179 | e.Source, e.Message); | ||
| 180 | } | ||
| 177 | 181 | ||
| 178 | return new Dictionary<AssetType, InventoryFolderBase>(); | 182 | return new Dictionary<AssetType, InventoryFolderBase>(); |
| 179 | } | 183 | } |