* Fixed a potential race condition with adding Caps handlers
parent
38fe0dfa90
commit
badcbd4bea
|
@ -1334,8 +1334,16 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
{
|
{
|
||||||
//MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " +
|
//MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " +
|
||||||
// agent.AgentID.ToStringHyphenated());
|
// agent.AgentID.ToStringHyphenated());
|
||||||
|
try
|
||||||
|
{
|
||||||
m_capsHandlers[agent.AgentID] = cap;
|
m_capsHandlers[agent.AgentID] = cap;
|
||||||
}
|
}
|
||||||
|
catch (System.Collections.Generic.KeyNotFoundException)
|
||||||
|
{
|
||||||
|
// Fix for a potential race condition.
|
||||||
|
m_capsHandlers.Add(agent.AgentID, cap);
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_capsHandlers.Add(agent.AgentID, cap);
|
m_capsHandlers.Add(agent.AgentID, cap);
|
||||||
|
|
Loading…
Reference in New Issue