This changeset is the step 1 of 2 in refactoring

OpenSim.Region.Environment into a "framework" part and a modules only
part. This first changeset refactors OpenSim.Region.Environment.Scenes,
OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces
into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region
modules in OpenSim.Region.Environment.

The next step will be to move region modules up from
OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and
then sort out which modules are really core modules and which should
move out to forge.

I've been very careful to NOT BREAK anything. i hope i've
succeeded. as this is the work of a whole week i hope i managed to
keep track with the applied patches of the last week --- could any of
you that did check in stuff have a look at whether it survived? thx!

1 files changed, 9 insertions, 6 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 24eaad1..2877dcd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -32,10 +32,10 @@ using OpenMetaverse;
 using OpenMetaverse.Packets;
 using log4net;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Types;
+using OpenSim.Region.Framework.Scenes.Types;
 using OpenSim.Region.Physics.Manager;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Scenes
 {
     public delegate void PhysicsCrash();
 
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// Delete an object from the scene
         /// </summary>
         /// <returns>true if the object was deleted, false if there was no object to delete</returns>
-        protected internal bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
+        public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
         {
             if (Entities.ContainsKey(uuid))
             {
@@ -797,8 +797,11 @@ namespace OpenSim.Region.Environment.Scenes
         /// suitable solution).
         /// </summary>
         /// <param name="agentId"></param>
-        /// <returns>null if either the avatar wasn't in the scene, or they do not have a controlling client</returns>
-        protected internal IClientAPI GetControllingClient(UUID agentId)
+        /// <returns>null if either the avatar wasn't in the scene, or
+        /// they do not have a controlling client</returns>
+        /// <remarks>this used to be protected internal, but that
+        /// prevents CapabilitiesModule from accessing it</remarks>
+        public IClientAPI GetControllingClient(UUID agentId)
         {
             ScenePresence presence = GetScenePresence(agentId);
 
@@ -1034,7 +1037,7 @@ namespace OpenSim.Region.Environment.Scenes
             return Entities.GetEntities();
         }
 
-        protected internal Dictionary<uint, float> GetTopScripts()
+        public Dictionary<uint, float> GetTopScripts()
         {
             Dictionary<uint, float> topScripts = new Dictionary<uint, float>();