aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-06 22:48:05 +0100
committerJustin Clark-Casey (justincc)2011-09-06 22:48:05 +0100
commite6cd4defdbee5d6df9cb5809ab66619ac1e51c9b (patch)
treeb2ac8bb3df9d27c0ec29b77f8555537811dae5d3
parentComment out SceneViewer.Reset() and stop calling from Close() since this is u... (diff)
downloadopensim-SC_OLD-e6cd4defdbee5d6df9cb5809ab66619ac1e51c9b.zip
opensim-SC_OLD-e6cd4defdbee5d6df9cb5809ab66619ac1e51c9b.tar.gz
opensim-SC_OLD-e6cd4defdbee5d6df9cb5809ab66619ac1e51c9b.tar.bz2
opensim-SC_OLD-e6cd4defdbee5d6df9cb5809ab66619ac1e51c9b.tar.xz
Lock m_pendingObjects when calling GetPendingObjectsCount().
This is only called by a region console command. We should also be locking m_partsUpdateQueue when dequeueing the next part, or locking m_pendingObjects in QueuePartForUpdate(). However, I won't do this now since I don't have time to analyze how this would affect liveness.
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 9ad80b8..50e1e39 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -231,7 +231,8 @@ namespace OpenSim.Region.Framework.Scenes
231 public int GetPendingObjectsCount() 231 public int GetPendingObjectsCount()
232 { 232 {
233 if (m_pendingObjects != null) 233 if (m_pendingObjects != null)
234 return m_pendingObjects.Count; 234 lock (m_pendingObjects)
235 return m_pendingObjects.Count;
235 236
236 return 0; 237 return 0;
237 } 238 }