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

replace no thread safe code

LSLKeyTest
UbitUmarov 2016-09-19 12:39:22 +01:00
parent 092d4fb9ff
commit 7e751d5010
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
View File

@ -278,10 +278,12 @@ namespace OpenSim.Services.Connectors
public GridRegion GetRegionByPosition(UUID scopeID, int x, int y) public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
{ {
GridRegion rinfo = null;
ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y); ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y);
if (m_regionCache.Contains(regionHandle)) // this cache includes NULL regions
return (GridRegion)m_regionCache[regionHandle]; if (m_regionCache.TryGetValue(regionHandle, out rinfo))
return rinfo;
Dictionary<string, object> sendData = new Dictionary<string, object>(); Dictionary<string, object> sendData = new Dictionary<string, object>();
@ -304,7 +306,6 @@ namespace OpenSim.Services.Connectors
return null; return null;
} }
GridRegion rinfo = null;
if (reply != string.Empty) if (reply != string.Empty)
{ {
Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);