diff options
| author | Diva Canto | 2009-08-11 14:31:45 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-11 14:31:45 -0700 |
| commit | bd7ff803fe189ffd730599350429d9b9d41582be (patch) | |
| tree | 6f6d69c66a5a97e34d820764713b9a3132d64b02 /OpenSim/Services | |
| parent | Added new operations to mock inventory service in tests. (diff) | |
| download | opensim-SC-bd7ff803fe189ffd730599350429d9b9d41582be.zip opensim-SC-bd7ff803fe189ffd730599350429d9b9d41582be.tar.gz opensim-SC-bd7ff803fe189ffd730599350429d9b9d41582be.tar.bz2 opensim-SC-bd7ff803fe189ffd730599350429d9b9d41582be.tar.xz | |
Re-adding a conditional in UserManager that was removed with arthusv's commit. Changing new inventory ops to POST.
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index 5efcf3a..5fb4815 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | |||
| @@ -167,11 +167,11 @@ namespace OpenSim.Services.Connectors | |||
| 167 | //try | 167 | //try |
| 168 | //{ | 168 | //{ |
| 169 | // return SynchronousRestSessionObjectPoster<Guid, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject( | 169 | // return SynchronousRestSessionObjectPoster<Guid, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject( |
| 170 | // "GET", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); | 170 | // "POST", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); |
| 171 | //} | 171 | //} |
| 172 | //catch (Exception e) | 172 | //catch (Exception e) |
| 173 | //{ | 173 | //{ |
| 174 | // m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderForType operation failed, {0} {1}", | 174 | // m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetSystemFolders operation failed, {0} {1}", |
| 175 | // e.Source, e.Message); | 175 | // e.Source, e.Message); |
| 176 | //} | 176 | //} |
| 177 | 177 | ||