From: Alan M Webb <alan_webb@us.ibm.com>

  This fixes *another* sync error in a list/dictionary
  iterator. This time in WorldComm. I'm beginning to think
  something is going on...

1 files changed, 9 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 090f1d5..08e08c8 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -575,13 +575,16 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         {
             List<Object> data = new List<Object>();
 
-            foreach (List<ListenerInfo> list in m_listeners.Values)
+            lock (m_listeners)
             {
-                foreach (ListenerInfo l in list)
-                {
-                    if (l.GetItemID() == itemID)
-                        data.AddRange(l.GetSerializationData());
-                }
+                                foreach (List<ListenerInfo> list in m_listeners.Values)
+                                {
+                                        foreach (ListenerInfo l in list)
+                                        {
+                                                if (l.GetItemID() == itemID)
+                                                        data.AddRange(l.GetSerializationData());
+                                        }
+                                }
             }
             return (Object[])data.ToArray();
         }