diff options
author | Melanie Thielker | 2009-03-22 15:42:22 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-03-22 15:42:22 +0000 |
commit | e6bb86a22428c6ed9e3d97e5347835e5e5cff598 (patch) | |
tree | e4c82542e73b0e048f0f0d1c3b6352515f4ad326 /OpenSim/Region/Communications | |
parent | Fox a null ref in the inventory give module (diff) | |
download | opensim-SC_OLD-e6bb86a22428c6ed9e3d97e5347835e5e5cff598.zip opensim-SC_OLD-e6bb86a22428c6ed9e3d97e5347835e5e5cff598.tar.gz opensim-SC_OLD-e6bb86a22428c6ed9e3d97e5347835e5e5cff598.tar.bz2 opensim-SC_OLD-e6bb86a22428c6ed9e3d97e5347835e5e5cff598.tar.xz |
Add QueryItem method to secure inventory and HG inventory, change method sig to
provide additional information the HG needs.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs | 23 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs | 16 |
2 files changed, 39 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs index 8296910..9d70c46 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs | |||
@@ -317,6 +317,29 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
317 | 317 | ||
318 | return false; | 318 | return false; |
319 | } | 319 | } |
320 | |||
321 | public InventoryItemBase QueryItem(InventoryItemBase item, UUID session_id) | ||
322 | { | ||
323 | if (IsLocalStandaloneUser(item.Owner)) | ||
324 | { | ||
325 | return base.QueryItem(item); | ||
326 | } | ||
327 | |||
328 | try | ||
329 | { | ||
330 | string invServ = GetUserInventoryURI(item.Owner); | ||
331 | |||
332 | return SynchronousRestSessionObjectPoster<InventoryItemBase, InventoryItemBase>.BeginPostObject( | ||
333 | "POST", invServ + "/QueryItem/", item, session_id.ToString(), item.Owner.ToString()); | ||
334 | } | ||
335 | catch (WebException e) | ||
336 | { | ||
337 | m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: Query inventory item operation failed, {0} {1}", | ||
338 | e.Source, e.Message); | ||
339 | } | ||
340 | |||
341 | return null; | ||
342 | } | ||
320 | #endregion | 343 | #endregion |
321 | 344 | ||
322 | #region Methods common to ISecureInventoryService and IInventoryService | 345 | #region Methods common to ISecureInventoryService and IInventoryService |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs index 0f4c732..0f50b01 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs | |||
@@ -296,6 +296,22 @@ namespace OpenSim.Region.Communications.OGS1 | |||
296 | return false; | 296 | return false; |
297 | } | 297 | } |
298 | 298 | ||
299 | public InventoryItemBase QueryItem(InventoryItemBase item, UUID session_id) | ||
300 | { | ||
301 | try | ||
302 | { | ||
303 | return SynchronousRestSessionObjectPoster<InventoryItemBase, InventoryItemBase>.BeginPostObject( | ||
304 | "POST", _inventoryServerUrl + "/QueryItem/", item, session_id.ToString(), item.Owner.ToString()); | ||
305 | } | ||
306 | catch (WebException e) | ||
307 | { | ||
308 | m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Query inventory item operation failed, {0} {1}", | ||
309 | e.Source, e.Message); | ||
310 | } | ||
311 | |||
312 | return null; | ||
313 | } | ||
314 | |||
299 | public bool HasInventoryForUser(UUID userID) | 315 | public bool HasInventoryForUser(UUID userID) |
300 | { | 316 | { |
301 | return false; | 317 | return false; |