diff options
author | Melanie Thielker | 2009-03-23 00:11:34 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-03-23 00:11:34 +0000 |
commit | 412112acbafa6e1f111b12007fd3a81728d0b2f5 (patch) | |
tree | e7c8b2d89c8c01d95049c3b57b925d9f31cb61e8 /OpenSim/Region/Communications | |
parent | Send proper creation date on item gives, so objects will appear at the top of (diff) | |
download | opensim-SC_OLD-412112acbafa6e1f111b12007fd3a81728d0b2f5.zip opensim-SC_OLD-412112acbafa6e1f111b12007fd3a81728d0b2f5.tar.gz opensim-SC_OLD-412112acbafa6e1f111b12007fd3a81728d0b2f5.tar.bz2 opensim-SC_OLD-412112acbafa6e1f111b12007fd3a81728d0b2f5.tar.xz |
Committing partial work on passing folders across instances. This may crash.
Diffstat (limited to '')
3 files changed, 55 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs index 9d70c46..a9e008c 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGInventoryService.cs | |||
@@ -340,6 +340,29 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
340 | 340 | ||
341 | return null; | 341 | return null; |
342 | } | 342 | } |
343 | |||
344 | public InventoryFolderBase QueryFolder(InventoryFolderBase item, UUID session_id) | ||
345 | { | ||
346 | if (IsLocalStandaloneUser(item.Owner)) | ||
347 | { | ||
348 | return base.QueryFolder(item); | ||
349 | } | ||
350 | |||
351 | try | ||
352 | { | ||
353 | string invServ = GetUserInventoryURI(item.Owner); | ||
354 | |||
355 | return SynchronousRestSessionObjectPoster<InventoryFolderBase, InventoryFolderBase>.BeginPostObject( | ||
356 | "POST", invServ + "/QueryFolder/", item, session_id.ToString(), item.Owner.ToString()); | ||
357 | } | ||
358 | catch (WebException e) | ||
359 | { | ||
360 | m_log.ErrorFormat("[HGrid INVENTORY SERVICE]: Query inventory item operation failed, {0} {1}", | ||
361 | e.Source, e.Message); | ||
362 | } | ||
363 | |||
364 | return null; | ||
365 | } | ||
343 | #endregion | 366 | #endregion |
344 | 367 | ||
345 | #region Methods common to ISecureInventoryService and IInventoryService | 368 | #region Methods common to ISecureInventoryService and IInventoryService |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 56566a8..26e4a55 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -312,6 +312,22 @@ namespace OpenSim.Region.Communications.OGS1 | |||
312 | return null; | 312 | return null; |
313 | } | 313 | } |
314 | 314 | ||
315 | public InventoryFolderBase QueryFolder(InventoryFolderBase item) | ||
316 | { | ||
317 | try | ||
318 | { | ||
319 | return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, InventoryFolderBase>( | ||
320 | "POST", _inventoryServerUrl + "/QueryFolder/", item); | ||
321 | } | ||
322 | catch (WebException e) | ||
323 | { | ||
324 | m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Query inventory item operation failed, {0} {1}", | ||
325 | e.Source, e.Message); | ||
326 | } | ||
327 | |||
328 | return null; | ||
329 | } | ||
330 | |||
315 | public bool HasInventoryForUser(UUID userID) | 331 | public bool HasInventoryForUser(UUID userID) |
316 | { | 332 | { |
317 | return false; | 333 | return false; |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs index 0f50b01..03fb0d5 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs | |||
@@ -312,6 +312,22 @@ namespace OpenSim.Region.Communications.OGS1 | |||
312 | return null; | 312 | return null; |
313 | } | 313 | } |
314 | 314 | ||
315 | public InventoryFolderBase QueryFolder(InventoryFolderBase item, UUID session_id) | ||
316 | { | ||
317 | try | ||
318 | { | ||
319 | return SynchronousRestSessionObjectPoster<InventoryFolderBase, InventoryFolderBase>.BeginPostObject( | ||
320 | "POST", _inventoryServerUrl + "/QueryFolder/", item, session_id.ToString(), item.Owner.ToString()); | ||
321 | } | ||
322 | catch (WebException e) | ||
323 | { | ||
324 | m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Query inventory item operation failed, {0} {1}", | ||
325 | e.Source, e.Message); | ||
326 | } | ||
327 | |||
328 | return null; | ||
329 | } | ||
330 | |||
315 | public bool HasInventoryForUser(UUID userID) | 331 | public bool HasInventoryForUser(UUID userID) |
316 | { | 332 | { |
317 | return false; | 333 | return false; |