From 80a41e670dd9bbd2771fbcf250362cefa2797306 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 22 Jun 2012 02:23:25 +0100
Subject: Avoid race condition between m_PrimObjects iteration in
 XEngine.PostObjectEvent and places where the list is modified by extending
 the m_PrimObjects lock.

---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine')

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 40f48e3..25b27b9 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1363,22 +1363,22 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     return false;
 
                 uuids = m_PrimObjects[localID];
-            }
 
-            foreach (UUID itemID in uuids)
-            {
-                IScriptInstance instance = null;
-                try
-                {
-                    if (m_Scripts.ContainsKey(itemID))
-                        instance = m_Scripts[itemID];
-                }
-                catch { /* ignore race conditions */ }
-
-                if (instance != null)
+                foreach (UUID itemID in uuids)
                 {
-                    instance.PostEvent(p);
-                    result = true;
+                    IScriptInstance instance = null;
+                    try
+                    {
+                        if (m_Scripts.ContainsKey(itemID))
+                            instance = m_Scripts[itemID];
+                    }
+                    catch { /* ignore race conditions */ }
+    
+                    if (instance != null)
+                    {
+                        instance.PostEvent(p);
+                        result = true;
+                    }
                 }
             }
             
-- 
cgit v1.1