Forgot to create an object before use. Now why can't .Net just do that itself? :)

1 files changed, 10 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
index 3ba4618..7b10713 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs
@@ -70,15 +70,20 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
         /// <summary>
         /// List of threads (classes) processing event queue
         /// </summary>
-        internal List<EventQueueThreadClass> eventQueueThreads;
+        internal List<EventQueueThreadClass> eventQueueThreads;                             // Thread pool that we work on
         /// <summary>
-        /// Global static list of threads (classes) processing event queue -- used by max enforcment thread
+        /// Locking access to eventQueueThreads AND staticGlobalEventQueueThreads.
+        /// Note that this may or may not be a reference to a static object depending on PrivateRegionThreads config setting.
         /// </summary>
-        private List<EventQueueThreadClass> staticGlobalEventQueueThreads;
+        private object eventQueueThreadsLock;
+        // Static objects for referencing the objects above if we don't have private threads:
+        internal static List<EventQueueThreadClass> staticEventQueueThreads;                // A static reference used if we don't use private threads
+        internal static object staticEventQueueThreadsLock;                                 // Statick lock object reference for same reason
+
         /// <summary>
-        /// Locking access to eventQueueThreads AND staticGlobalEventQueueThreads. Note that this may or may not be static depending on PrivateRegionThreads config setting.
+        /// Global static list of all threads (classes) processing event queue -- used by max enforcment thread
         /// </summary>
-        private object eventQueueThreadsLock;
+        private List<EventQueueThreadClass> staticGlobalEventQueueThreads = new List<EventQueueThreadClass>();
 
         /// <summary>
         /// Used internally to specify how many threads should exit gracefully
@@ -86,8 +91,6 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
         public int ThreadsToExit;
         public object ThreadsToExitLock = new object();
 
-        private static List<EventQueueThreadClass> staticEventQueueThreads;// = new List<EventQueueThreadClass>();
-        private static object staticEventQueueThreadsLock;// = new object();
 
         public object queueLock = new object(); // Mutex lock object