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

* Attempt to resolve mantis 873 by placing caps removal operations in a critical section

0.6.0-stable
Justin Clarke Casey 2008-04-02 16:46:58 +00:00
parent 30ea28c3b1
commit f27f861072
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Capabilities/Caps.cs
View File

@ -401,7 +401,7 @@ namespace OpenSim.Region.Capabilities
{ {
try try
{ {
// m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param);
Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request)); Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Helpers.StringToField(request));
LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate(); LLSDTaskScriptUpdate llsdUpdateRequest = new LLSDTaskScriptUpdate();

3
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1754,6 +1754,8 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
/// <param name="agentId"></param> /// <param name="agentId"></param>
public void RemoveCapsHandler(LLUUID agentId) public void RemoveCapsHandler(LLUUID agentId)
{
lock (m_capsHandlers)
{ {
if (m_capsHandlers.ContainsKey(agentId)) if (m_capsHandlers.ContainsKey(agentId))
{ {
@ -1771,6 +1773,7 @@ namespace OpenSim.Region.Environment.Scenes
agentId, RegionInfo.RegionName); agentId, RegionInfo.RegionName);
} }
} }
}
/// <summary> /// <summary>
/// ///