OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Minor refactoring in OGS1InventoryService

0.6.0-stable
Justin Clarke Casey 2008-04-11 19:04:33 +00:00
parent 7bfd7e6f08
commit 8f345d36d8
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
View File

@ -58,35 +58,28 @@ namespace OpenSim.Region.Communications.OGS1
{ {
InventoryRequest request = new InventoryRequest(userID, callback); InventoryRequest request = new InventoryRequest(userID, callback);
m_RequestingInventory.Add(userID, request); m_RequestingInventory.Add(userID, request);
RequestInventory(userID);
try
{
m_log.InfoFormat(
"[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}",
_inventoryServerUrl, userID);
RestObjectPosterResponse<InventoryCollection> requester
= new RestObjectPosterResponse<InventoryCollection>();
requester.ResponseCallback = InventoryResponse;
requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
}
catch (System.Net.WebException e)
{
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
e.Source, e.Message);
}
} }
} else
/// <summary>
/// Request the entire user's inventory (folders and items) from the inventory server.
///
/// XXX May want to change this so that we don't end up shuffling over data which might prove
/// entirely unnecessary.
/// </summary>
/// <param name="userID"></param>
private void RequestInventory(LLUUID userID)
{
try
{ {
m_log.InfoFormat( m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID);
"[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}",
_inventoryServerUrl, userID);
RestObjectPosterResponse<InventoryCollection> requester
= new RestObjectPosterResponse<InventoryCollection>();
requester.ResponseCallback = InventoryResponse;
requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
}
catch (System.Net.WebException e)
{
m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
e.Source, e.Message);
} }
} }