diff options
| author | Teravus Ovares | 2007-12-18 01:49:21 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2007-12-18 01:49:21 +0000 |
| commit | badcbd4beaaa8e4f1f087d55622bf8c5cb947642 (patch) | |
| tree | 6d72e3fac5b0f5223b6876a2b3a3e5dee49075ea /OpenSim | |
| parent | * Added a Verbose and Debug error to border crossing so that this can be diag... (diff) | |
| download | opensim-SC-badcbd4beaaa8e4f1f087d55622bf8c5cb947642.zip opensim-SC-badcbd4beaaa8e4f1f087d55622bf8c5cb947642.tar.gz opensim-SC-badcbd4beaaa8e4f1f087d55622bf8c5cb947642.tar.bz2 opensim-SC-badcbd4beaaa8e4f1f087d55622bf8c5cb947642.tar.xz | |
* Fixed a potential race condition with adding Caps handlers
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ac37fdd..81b0919 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
| @@ -1334,7 +1334,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1334 | { | 1334 | { |
| 1335 | //MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " + | 1335 | //MainLog.Instance.Warn("client", "Adding duplicate CAPS entry for user " + |
| 1336 | // agent.AgentID.ToStringHyphenated()); | 1336 | // agent.AgentID.ToStringHyphenated()); |
| 1337 | m_capsHandlers[agent.AgentID] = cap; | 1337 | try |
| 1338 | { | ||
| 1339 | m_capsHandlers[agent.AgentID] = cap; | ||
| 1340 | } | ||
| 1341 | catch (System.Collections.Generic.KeyNotFoundException) | ||
| 1342 | { | ||
| 1343 | // Fix for a potential race condition. | ||
| 1344 | m_capsHandlers.Add(agent.AgentID, cap); | ||
| 1345 | } | ||
| 1338 | } | 1346 | } |
| 1339 | else | 1347 | else |
| 1340 | { | 1348 | { |