diff options
author | Justin Clarke Casey | 2008-04-11 19:04:33 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-11 19:04:33 +0000 |
commit | 8f345d36d83cb9c3ebf97e7bcc69fa31d5441c78 (patch) | |
tree | 107fe562795959ae13644c37bd331f1d7ba52a09 | |
parent | * Remove the worst excesses of my inventory debugging code (diff) | |
download | opensim-SC-8f345d36d83cb9c3ebf97e7bcc69fa31d5441c78.zip opensim-SC-8f345d36d83cb9c3ebf97e7bcc69fa31d5441c78.tar.gz opensim-SC-8f345d36d83cb9c3ebf97e7bcc69fa31d5441c78.tar.bz2 opensim-SC-8f345d36d83cb9c3ebf97e7bcc69fa31d5441c78.tar.xz |
* Minor refactoring in OGS1InventoryService
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 8f293f9..41ca4fb 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -58,35 +58,28 @@ namespace OpenSim.Region.Communications.OGS1 | |||
58 | { | 58 | { |
59 | InventoryRequest request = new InventoryRequest(userID, callback); | 59 | InventoryRequest request = new InventoryRequest(userID, callback); |
60 | m_RequestingInventory.Add(userID, request); | 60 | m_RequestingInventory.Add(userID, request); |
61 | RequestInventory(userID); | 61 | |
62 | } | 62 | try |
63 | } | 63 | { |
64 | 64 | m_log.InfoFormat( | |
65 | /// <summary> | 65 | "[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}", |
66 | /// Request the entire user's inventory (folders and items) from the inventory server. | 66 | _inventoryServerUrl, userID); |
67 | /// | 67 | |
68 | /// XXX May want to change this so that we don't end up shuffling over data which might prove | 68 | RestObjectPosterResponse<InventoryCollection> requester |
69 | /// entirely unnecessary. | 69 | = new RestObjectPosterResponse<InventoryCollection>(); |
70 | /// </summary> | 70 | requester.ResponseCallback = InventoryResponse; |
71 | /// <param name="userID"></param> | 71 | |
72 | private void RequestInventory(LLUUID userID) | 72 | requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID); |
73 | { | 73 | } |
74 | try | 74 | catch (System.Net.WebException e) |
75 | { | 75 | { |
76 | m_log.InfoFormat( | 76 | m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", |
77 | "[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}", | 77 | e.Source, e.Message); |
78 | _inventoryServerUrl, userID); | 78 | } |
79 | |||
80 | RestObjectPosterResponse<InventoryCollection> requester | ||
81 | = new RestObjectPosterResponse<InventoryCollection>(); | ||
82 | requester.ResponseCallback = InventoryResponse; | ||
83 | |||
84 | requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID); | ||
85 | } | 79 | } |
86 | catch (System.Net.WebException e) | 80 | else |
87 | { | 81 | { |
88 | m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", | 82 | m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID); |
89 | e.Source, e.Message); | ||
90 | } | 83 | } |
91 | } | 84 | } |
92 | 85 | ||