From e6cd4defdbee5d6df9cb5809ab66619ac1e51c9b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 6 Sep 2011 22:48:05 +0100
Subject: 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.
---
 OpenSim/Region/Framework/Scenes/SceneViewer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneViewer.cs')

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
         public int GetPendingObjectsCount()
         {
             if (m_pendingObjects != null)
-                return m_pendingObjects.Count;
+                lock (m_pendingObjects)
+                    return m_pendingObjects.Count;
 
             return 0;
         }
-- 
cgit v1.1