aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-14 07:55:33 +0000
committerTeravus Ovares2007-12-14 07:55:33 +0000
commit79935881aa4ac16990625360b256aa5eebe12ce7 (patch)
tree2059842c03a6b7ae36692e530c18fb1d9956ba40 /OpenSim/Region
parentAdded copyright notice. (diff)
downloadopensim-SC-79935881aa4ac16990625360b256aa5eebe12ce7.zip
opensim-SC-79935881aa4ac16990625360b256aa5eebe12ce7.tar.gz
opensim-SC-79935881aa4ac16990625360b256aa5eebe12ce7.tar.bz2
opensim-SC-79935881aa4ac16990625360b256aa5eebe12ce7.tar.xz
* Patch from Justincc that swaps out LLUUIDs for Guid on the inventory REST calls
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 6edb149..5342127 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -65,8 +65,8 @@ namespace OpenSim.Region.Communications.OGS1
65 { 65 {
66 RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>(); 66 RestObjectPosterResponse<InventoryCollection> requester = new RestObjectPosterResponse<InventoryCollection>();
67 requester.ResponseCallback = InventoryResponse; 67 requester.ResponseCallback = InventoryResponse;
68 // THIS SHOULD BE A Guid, NOT A LLUUID! No longer Serializable! This will fail EVERY TIME. 68
69 requester.BeginPostObject<LLUUID>(_inventoryServerUrl + "/GetInventory/", userID); 69 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
70 } 70 }
71 catch (Exception) 71 catch (Exception)
72 { 72 {
@@ -169,4 +169,4 @@ namespace OpenSim.Region.Communications.OGS1
169 } 169 }
170 } 170 }
171 } 171 }
172} \ No newline at end of file 172}