diff options
| author | Melanie | 2012-04-18 00:28:33 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-18 00:28:33 +0100 |
| commit | fc9f244a7da6f5b4507278988259cfc54e0dd375 (patch) | |
| tree | 0ee0202e5f6acf9ebfbd1fd0442a0c6b9f1e3fcc /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-fc9f244a7da6f5b4507278988259cfc54e0dd375.zip opensim-SC_OLD-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.gz opensim-SC_OLD-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.bz2 opensim-SC_OLD-fc9f244a7da6f5b4507278988259cfc54e0dd375.tar.xz | |
Merge branch 'master' into careminster
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 cd4bd42..0a1b921 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -101,6 +101,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 101 | /// </summary> | 101 | /// </summary> |
| 102 | protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalPartID = new Dictionary<uint, SceneObjectGroup>(); | 102 | protected internal Dictionary<uint, SceneObjectGroup> SceneObjectGroupsByLocalPartID = new Dictionary<uint, SceneObjectGroup>(); |
| 103 | 103 | ||
| 104 | /// <summary> | ||
| 105 | /// Lock to prevent object group update, linking and delinking operations from running concurrently. | ||
| 106 | /// </summary> | ||
| 104 | private Object m_updateLock = new Object(); | 107 | private Object m_updateLock = new Object(); |
| 105 | 108 | ||
| 106 | #endregion | 109 | #endregion |