2 files changed, 34 insertions, 11 deletions

diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
index ebaa406..14574e0 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueGetModule.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Region.Environment.Modules.Framework
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private Scene m_scene = null;
         private IConfigSource m_gConfig;
+        bool enabledYN = false;
         
         private Dictionary<UUID, int> m_ids = new Dictionary<UUID, int>();
 
@@ -72,26 +73,34 @@ namespace OpenSim.Region.Environment.Modules.Framework
         public void Initialise(Scene scene, IConfigSource config)
         {
             m_gConfig = config;
-            m_scene = scene;
+
 
 
             IConfig startupConfig = m_gConfig.Configs["Startup"];
 
             ReadConfigAndPopulate(scene, startupConfig, "Startup");
-           
-            scene.RegisterModuleInterface<IEventQueue>(this);
-
-            scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnClientClosed += ClientClosed;
-            scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
-            scene.EventManager.OnMakeChildAgent += MakeChildAgent;
-            scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+
+            if (enabledYN)
+            {
+                m_scene = scene;
+                scene.RegisterModuleInterface<IEventQueue>(this);
+
+                scene.EventManager.OnNewClient += OnNewClient;
+                scene.EventManager.OnClientClosed += ClientClosed;
+                scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
+                scene.EventManager.OnMakeChildAgent += MakeChildAgent;
+                scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            }
+            else
+            {
+                m_gConfig = null;
+            }
         
         }
 
         private void ReadConfigAndPopulate(Scene scene, IConfig startupConfig, string p)
         {
-           
+            enabledYN = startupConfig.GetBoolean("EventQueue", false);
         }
 
         public void PostInitialise()
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index c95068b..a340fe2 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -31,9 +31,12 @@ using System.Net;
 using System.Reflection;
 using System.Threading;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Region.Interfaces;
+using LLSD = OpenMetaverse.StructuredData.LLSD;
 
 namespace OpenSim.Region.Environment.Scenes
 {
@@ -283,7 +286,18 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (regionAccepted)
             {
-                avatar.ControllingClient.InformClientOfNeighbour(regionHandle, endPoint);
+                IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
+                if (eq != null)
+                {
+                    LLSD Item = EventQueueHelper.EnableSimulator(regionHandle, endPoint);
+                    eq.Enqueue(Item, avatar.UUID);
+                }
+                else
+                {
+                    avatar.ControllingClient.InformClientOfNeighbour(regionHandle, endPoint);
+                    // TODO: make Event Queue disablable!
+                }
+                
                 avatar.AddNeighbourRegion(regionHandle);
                 m_log.Info("[INTERGRID]: Completed inform client about neighbours");
             }