diff options
| author | Mic Bowman | 2012-04-25 09:52:44 -0700 |
|---|---|---|
| committer | Mic Bowman | 2012-04-25 09:52:44 -0700 |
| commit | 1afae013111b7c817037371fca805a78c3ab67cc (patch) | |
| tree | dc4f08217c64fd92f4fac250344f009f583fca4e /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Add try/catch around Json script method registration to avoild some issues (diff) | |
| parent | Slight rewording of output messages. (diff) | |
| download | opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.zip opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.gz opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.bz2 opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 0098add..67eb0fe 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -91,6 +91,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 91 | /// </summary> | 91 | /// </summary> |
| 92 | protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalPartID = new Dictionary<uint, SceneObjectGroup>(); | 92 | protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalPartID = new Dictionary<uint, SceneObjectGroup>(); |
| 93 | 93 | ||
| 94 | /// <summary> | ||
| 95 | /// Lock to prevent object group update, linking and delinking operations from running concurrently. | ||
| 96 | /// </summary> | ||
| 94 | private Object m_updateLock = new Object(); | 97 | private Object m_updateLock = new Object(); |
| 95 | 98 | ||
| 96 | #endregion | 99 | #endregion |