diff options
| author | Diva Canto | 2009-08-11 12:30:28 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-11 12:30:28 -0700 |
| commit | e3dbd0e049e96c30660155584d034d8b550f9063 (patch) | |
| tree | f627211d00e82dbac0c0497da23e075f42bee729 /OpenSim/Services | |
| parent | Merged with origin, and resolved one conflict in LoginServiceTests.cs (diff) | |
| download | opensim-SC-e3dbd0e049e96c30660155584d034d8b550f9063.zip opensim-SC-e3dbd0e049e96c30660155584d034d8b550f9063.tar.gz opensim-SC-e3dbd0e049e96c30660155584d034d8b550f9063.tar.bz2 opensim-SC-e3dbd0e049e96c30660155584d034d8b550f9063.tar.xz | |
Added http handlers for the two new inventory operations.
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index 3b15831..4837c0d 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | |||
| @@ -165,8 +165,8 @@ namespace OpenSim.Services.Connectors | |||
| 165 | { | 165 | { |
| 166 | try | 166 | try |
| 167 | { | 167 | { |
| 168 | return SynchronousRestSessionObjectPoster<string, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject( | 168 | return SynchronousRestSessionObjectPoster<Guid, Dictionary<AssetType, InventoryFolderBase>>.BeginPostObject( |
| 169 | "GET", m_ServerURI + "/SystemFolders/", userID, sessionID.ToString(), userID.ToString()); | 169 | "GET", m_ServerURI + "/SystemFolders/", new Guid(userID), sessionID.ToString(), userID.ToString()); |
| 170 | } | 170 | } |
| 171 | catch (Exception e) | 171 | catch (Exception e) |
| 172 | { | 172 | { |
| @@ -187,8 +187,8 @@ namespace OpenSim.Services.Connectors | |||
| 187 | { | 187 | { |
| 188 | try | 188 | try |
| 189 | { | 189 | { |
| 190 | return SynchronousRestSessionObjectPoster<UUID, InventoryCollection>.BeginPostObject( | 190 | return SynchronousRestSessionObjectPoster<Guid, InventoryCollection>.BeginPostObject( |
| 191 | "GET", m_ServerURI + "/GetFolderContents/", folderID, sessionID.ToString(), userID.ToString()); | 191 | "POST", m_ServerURI + "/GetFolderContent/", folderID.Guid, sessionID.ToString(), userID.ToString()); |
| 192 | } | 192 | } |
| 193 | catch (Exception e) | 193 | catch (Exception e) |
| 194 | { | 194 | { |