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!

4 files changed, 17 insertions, 20 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 73a5a3a..bd9c260 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -40,13 +40,13 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+// using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Scenes;
 
 //using HyperGrid.Framework;
 //using OpenSim.Region.Communications.Hypergrid;
 
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
     public class HGAssetMapper
     {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index bdb90d8..f36075e 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -40,10 +40,10 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+// using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
     public partial class HGScene : Scene
     {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
index ca644a6..a52fdc6 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.cs
@@ -34,11 +34,11 @@ using OpenMetaverse;
 using OpenSim.Framework;
 
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+// using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Scenes;
 using TPFlags = OpenSim.Framework.Constants.TeleportFlags;
 
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
     public partial class HGScene : Scene
     {
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 5e3e03f..d0dc4f7 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -38,11 +38,11 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Communications.Capabilities;
-using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+// using OpenSim.Region.Environment;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Scenes.Hypergrid
+namespace OpenSim.Region.Framework.Scenes.Hypergrid
 {
     public class HGSceneCommunicationService : SceneCommunicationService
     {
@@ -208,16 +208,14 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
 
                             if (eq != null)
                             {
-                                OSD Item = EventQueueHelper.EnableSimulator(realHandle, endPoint);
-                                eq.Enqueue(Item, avatar.UUID);
+                                eq.EnableSimulator(realHandle, 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
                             {
@@ -267,9 +265,8 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
                         ///
                         if (eq != null)
                         {
-                            OSD Item = EventQueueHelper.TeleportFinishEvent(realHandle, 13, endPoint,
-                                                                             4, teleportFlags, capsPath, avatar.UUID);
-                            eq.Enqueue(Item, avatar.UUID);
+                            eq.TeleportFinishEvent(realHandle, 13, endPoint,
+                                                   4, teleportFlags, capsPath, avatar.UUID);
                         }
                         else
                         {