1 files changed, 14 insertions, 12 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f798a0e..f07391d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -40,10 +40,8 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Interfaces;
-using OpenSim.Region.Environment.Modules.World.Terrain;
-using OpenSim.Region.Environment.Scenes.Scripting;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes.Scripting;
 using OpenSim.Region.Physics.Manager;
 using Nini.Config;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
@@ -52,7 +50,7 @@ using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 using Timer = System.Timers.Timer;
 using OSD = OpenMetaverse.StructuredData.OSD;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public delegate bool FilterAvatarList(ScenePresence avatar);
 
@@ -123,7 +121,12 @@ namespace OpenSim.Region.Environment.Scenes
         protected IInterregionCommsOut m_interregionCommsOut;
         protected IInterregionCommsIn m_interregionCommsIn;
         protected IDialogModule m_dialogModule;
-        protected internal ICapabilitiesModule CapsModule;
+
+        protected ICapabilitiesModule m_capsModule;
+        public ICapabilitiesModule CapsModule
+        {
+            get { return m_capsModule; }
+        }
 
         // Central Update Loop
 
@@ -747,7 +750,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_interregionCommsOut = RequestModuleInterface<IInterregionCommsOut>();
             m_interregionCommsIn = RequestModuleInterface<IInterregionCommsIn>();
             m_dialogModule = RequestModuleInterface<IDialogModule>();
-            CapsModule = RequestModuleInterface<ICapabilitiesModule>();
+            m_capsModule = RequestModuleInterface<ICapabilitiesModule>();
         }
 
         #endregion
@@ -972,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// Perform delegate action on all clients subscribing to updates from this region.
         /// </summary>
         /// <returns></returns>
-        internal void Broadcast(Action<IClientAPI> whatToDo)
+        public void Broadcast(Action<IClientAPI> whatToDo)
         {
             ForEachScenePresence(delegate(ScenePresence presence) { whatToDo(presence.ControllingClient); });
         }
@@ -2965,8 +2968,7 @@ namespace OpenSim.Region.Environment.Scenes
                     IEventQueue eq = RequestModuleInterface<IEventQueue>();
                     if (eq != null)
                     {
-                        OSD Item = EventQueueHelper.DisableSimulator(RegionInfo.RegionHandle);
-                        eq.Enqueue(Item, agentID);
+                        eq.DisableSimulator(RegionInfo.RegionHandle, agentID);
                     }
                     else
                         presence.ControllingClient.SendShutdownConnectionNotice();
@@ -3792,12 +3794,12 @@ namespace OpenSim.Region.Environment.Scenes
             return m_sceneGraph.GetSceneObjectPart(fullID);
         }
 
-        internal bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
+        public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
         {
             return m_sceneGraph.TryGetAvatar(avatarId, out avatar);
         }
 
-        internal bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
+        public bool TryGetAvatarByName(string avatarName, out ScenePresence avatar)
         {
             return m_sceneGraph.TryGetAvatarByName(avatarName, out avatar);
         }