diff options
author | Diva Canto | 2012-03-09 12:59:24 -0800 |
---|---|---|
committer | Diva Canto | 2012-03-09 12:59:24 -0800 |
commit | a58152bd2af64493e655d6f559bc366c38433187 (patch) | |
tree | 786bbae51662a948511f9d81d9211d2984676986 /OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |
parent | More on HG inventory transfers. Move the FireAndForget higher up. (diff) | |
download | opensim-SC_OLD-a58152bd2af64493e655d6f559bc366c38433187.zip opensim-SC_OLD-a58152bd2af64493e655d6f559bc366c38433187.tar.gz opensim-SC_OLD-a58152bd2af64493e655d6f559bc366c38433187.tar.bz2 opensim-SC_OLD-a58152bd2af64493e655d6f559bc366c38433187.tar.xz |
More on inventory transfer hold ups:
- Added an inventory cache for caching root and system folders
- Synchronized the remote inventory connector, so that all the remote inventory calls are serialized
This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs index a662abb..39e983b 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |||
@@ -48,6 +48,8 @@ namespace OpenSim.Services.Connectors | |||
48 | 48 | ||
49 | private string m_ServerURI = String.Empty; | 49 | private string m_ServerURI = String.Empty; |
50 | 50 | ||
51 | private object m_Lock = new object(); | ||
52 | |||
51 | public XInventoryServicesConnector() | 53 | public XInventoryServicesConnector() |
52 | { | 54 | { |
53 | } | 55 | } |
@@ -514,9 +516,11 @@ namespace OpenSim.Services.Connectors | |||
514 | { | 516 | { |
515 | sendData["METHOD"] = method; | 517 | sendData["METHOD"] = method; |
516 | 518 | ||
517 | string reply = SynchronousRestFormsRequester.MakeRequest("POST", | 519 | string reply = string.Empty; |
518 | m_ServerURI + "/xinventory", | 520 | lock (m_Lock) |
519 | ServerUtils.BuildQueryString(sendData)); | 521 | reply = SynchronousRestFormsRequester.MakeRequest("POST", |
522 | m_ServerURI + "/xinventory", | ||
523 | ServerUtils.BuildQueryString(sendData)); | ||
520 | 524 | ||
521 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( | 525 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse( |
522 | reply); | 526 | reply); |