diff options
| author | Melanie | 2010-09-17 22:06:18 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-17 22:06:18 +0100 |
| commit | a6382deec54d78af377b19fa6a98bc90877a5f8c (patch) | |
| tree | 0b9c1df3ff3bcd77a05504ad202e8fbf6f1a2cd4 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Add LandServices to make landmarks work right in grids (diff) | |
| parent | Remove the now unused partslock (diff) | |
| download | opensim-SC_OLD-a6382deec54d78af377b19fa6a98bc90877a5f8c.zip opensim-SC_OLD-a6382deec54d78af377b19fa6a98bc90877a5f8c.tar.gz opensim-SC_OLD-a6382deec54d78af377b19fa6a98bc90877a5f8c.tar.bz2 opensim-SC_OLD-a6382deec54d78af377b19fa6a98bc90877a5f8c.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 3bc7834..f9bfffd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -112,7 +112,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 112 | private long m_minPersistTime = 0; | 112 | private long m_minPersistTime = 0; |
| 113 | private Random m_rand; | 113 | private Random m_rand; |
| 114 | private bool m_suspendUpdates; | 114 | private bool m_suspendUpdates; |
| 115 | private System.Threading.ReaderWriterLockSlim m_partsLock = new System.Threading.ReaderWriterLockSlim(); | ||
| 116 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); | 115 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); |
| 117 | 116 | ||
| 118 | public bool areUpdatesSuspended | 117 | public bool areUpdatesSuspended |