1 files changed, 10 insertions, 17 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9935512..a2b2537 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -33,14 +33,13 @@ using System.Threading;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using log4net;
-using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Interfaces;
 using OSD = OpenMetaverse.StructuredData.OSD;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public delegate void KiPrimitiveDelegate(uint localID);
 
@@ -305,13 +304,10 @@ namespace OpenSim.Region.Environment.Scenes
                 IEventQueue eq = avatar.Scene.RequestModuleInterface<IEventQueue>();
                 if (eq != null)
                 {
-                    OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint);
-                    eq.Enqueue(Item, avatar.UUID);
-
-                    Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath);
-                    eq.Enqueue(Item, avatar.UUID);
-
-                    m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName);
+                    eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
+                    eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
+                    m_log.DebugFormat("[CAPS]: Sending new CAPS seed url {0} to client {1} in region {2}", 
+                                      capsPath, avatar.UUID, avatar.Scene.RegionInfo.RegionName);
                 }
                 else
                 {
@@ -806,16 +802,14 @@ namespace OpenSim.Region.Environment.Scenes
 
                             if (eq != null)
                             {
-                                OSD Item = EventQueueHelper.EnableSimulator(reg.RegionHandle, endPoint);
-                                eq.Enqueue(Item, avatar.UUID);
+                                eq.EnableSimulator(reg.RegionHandle, endPoint, avatar.UUID);
 
                                 // ES makes the client send a UseCircuitCode message to the destination, 
                                 // which triggers a bunch of things there.
                                 // So let's wait
                                 Thread.Sleep(2000);
 
-                                Item = EventQueueHelper.EstablishAgentCommunication(avatar.UUID, endPoint.ToString(), capsPath);
-                                eq.Enqueue(Item, avatar.UUID);
+                                eq.EstablishAgentCommunication(avatar.UUID, endPoint, capsPath);
                             }
                             else
                             {
@@ -860,9 +854,8 @@ namespace OpenSim.Region.Environment.Scenes
                         
                         if (eq != null)
                         {
-                            OSD Item = EventQueueHelper.TeleportFinishEvent(reg.RegionHandle, 13, endPoint,
-                                                                             4, teleportFlags, capsPath, avatar.UUID);
-                            eq.Enqueue(Item, avatar.UUID);
+                            eq.TeleportFinishEvent(reg.RegionHandle, 13, endPoint,
+                                                   4, teleportFlags, capsPath, avatar.UUID);
                         }
                         else
                         {