From 21bf26e9b472f830c1a78ae0be6fff5e1e77f250 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 27 Sep 2008 23:06:28 +0000
Subject: * Adds flag to enable/disable EventQueueGet. * If EventQueueGet is
 enabled, use that instead of a few UDP packets, if it's disabled use the UDP
 packets like normal. * We *really* suggest users do not turn on EventQueueGet
 yet..  as it's highly experimental, broken, and resource intensive * Updated
 OpenSim.ini.example * Testers of EventQueueGet..   in OpenSim.ini, it's in
 the [Startup] Section..   change EventQueue = false, to EventQueue = true.

---
 .../Environment/Scenes/SceneCommunicationService.cs      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')

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");
             }
-- 
cgit v1.1