ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2012-03-09 23:00:24 +00:00
parent 09d99cb222 5c5a493791
commit 3dbf754651
5 changed files with 121 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
View File

@@ -48,6 +48,8 @@ namespace OpenSim.Services.Connectors
private string m_ServerURI = String.Empty;
private object m_Lock = new object();
public XInventoryServicesConnector()
{
}
@@ -514,9 +516,11 @@ namespace OpenSim.Services.Connectors
{
sendData["METHOD"] = method;
string reply = SynchronousRestFormsRequester.MakeRequest("POST",
m_ServerURI + "/xinventory",
ServerUtils.BuildQueryString(sendData));
string reply = string.Empty;
lock (m_Lock)
reply = SynchronousRestFormsRequester.MakeRequest("POST",
m_ServerURI + "/xinventory",
ServerUtils.BuildQueryString(sendData));
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(
reply);