* Apply http://opensimulator.org/mantis/view.php?id=3179

* This slightly extends a lock in WorldCommModule so that it covers the GetNewHandle method which states in it's doc that it assumes locking has happened before the method is 
called
* Thanks DoranZemlja

1 files changed, 15 insertions, 15 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index b1f4b84..090f1d5 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -381,25 +381,25 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
             if (m_curlisteners < m_maxlisteners)
             {
-                int newHandle = GetNewHandle(itemID);
-
-                if (newHandle > 0)
+                lock (m_listeners)
                 {
-                    ListenerInfo li = new ListenerInfo(newHandle, localID, itemID, hostID, channel, name, id, msg);
+                    int newHandle = GetNewHandle(itemID);
 
-                    lock (m_listeners)
+                    if (newHandle > 0)
                     {
-                        List<ListenerInfo> listeners;
-                        if (!m_listeners.TryGetValue(channel,out listeners))
-                        {
-                            listeners = new List<ListenerInfo>();
-                            m_listeners.Add(channel, listeners);
-                        }
-                        listeners.Add(li);
-                        m_curlisteners++;
-                    }
+                        ListenerInfo li = new ListenerInfo(newHandle, localID, itemID, hostID, channel, name, id, msg);
 
-                    return newHandle;
+                            List<ListenerInfo> listeners;
+                            if (!m_listeners.TryGetValue(channel,out listeners))
+                            {
+                                listeners = new List<ListenerInfo>();
+                                m_listeners.Add(channel, listeners);
+                            }
+                            listeners.Add(li);
+                            m_curlisteners++;
+
+                        return newHandle;
+                    }
                 }
             }
             return -1;