* First example of moving stuff to a Region layer

* Also, changed RegionPresence to 'RegionSubscription' - let's just see where we land with this...

4 files changed, 53 insertions, 19 deletions

diff --git a/OpenSim/Region/Environment/Regions/Region.cs b/OpenSim/Region/Environment/Regions/Region.cs
index f7669a9..e95d9dc 100644
--- a/OpenSim/Region/Environment/Regions/Region.cs
+++ b/OpenSim/Region/Environment/Regions/Region.cs
@@ -1,15 +1,44 @@
 using System.Collections.Generic;

 using libsecondlife;

+using OpenSim.Region.Environment.Scenes;

+using OpenSim.Region.Terrain;

+using OpenSim.Framework.Interfaces;

+using System;

 

 namespace OpenSim.Region.Environment.Regions

 {

     public class Region

     {

-        private Dictionary<LLUUID, RegionPresence> m_regionPresences;

+        // This is a temporary (and real ugly) construct to emulate us really having a separate list

+        // of region subscribers. It should be removed ASAP, like.

 

-        public Region()

+        private readonly Scene m_scene;

+        private Dictionary<LLUUID, RegionSubscription> m_regionSubscriptions

         {

-            m_regionPresences = new Dictionary<LLUUID, RegionPresence>( );

+            get

+            {

+                Dictionary<LLUUID, RegionSubscription> subscriptions = new Dictionary<LLUUID, RegionSubscription>( );

+

+                foreach( ScenePresence presence in m_scene.GetScenePresences() )

+                {

+                    subscriptions.Add( presence.UUID, new RegionSubscription( presence.ControllingClient ));

+                }

+

+                return subscriptions;

+            }

+        }

+

+        public Region( Scene scene )

+        {

+            m_scene = scene; // The Scene reference should be removed.

+        }

+

+        internal void Broadcast( Action<IClientAPI> whatToDo )

+        {

+            foreach (RegionSubscription subscription in m_regionSubscriptions.Values )

+            {

+                whatToDo(subscription.Client);                

+            }

         }

     }

 }

diff --git a/OpenSim/Region/Environment/Regions/RegionPresence.cs b/OpenSim/Region/Environment/Regions/RegionPresence.cs
deleted file mode 100644
index 9720bb3..0000000
--- a/OpenSim/Region/Environment/Regions/RegionPresence.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using OpenSim.Framework.Interfaces;

-

-namespace OpenSim.Region.Environment.Regions

-{

-    public class RegionPresence

-    {

-        private IClientAPI m_client;

-

-        public RegionPresence(IClientAPI client )

-        {

-            m_client = client;

-        }

-    }

-}

diff --git a/OpenSim/Region/Environment/Regions/RegionSubscription.cs b/OpenSim/Region/Environment/Regions/RegionSubscription.cs
new file mode 100644
index 0000000..13cd0d5
--- /dev/null
+++ b/OpenSim/Region/Environment/Regions/RegionSubscription.cs
@@ -0,0 +1,19 @@
+using OpenSim.Framework.Interfaces;

+

+namespace OpenSim.Region.Environment.Regions

+{

+    public class RegionSubscription

+    {

+        private readonly IClientAPI m_client;

+

+        public RegionSubscription(IClientAPI client )

+        {

+            m_client = client;

+        }

+

+        public IClientAPI Client

+        {

+            get { return m_client; }

+        }

+    }

+}

diff --git a/OpenSim/Region/Environment/Regions/RegionManager.cs b/OpenSim/Region/Environment/Regions/RegionSubscriptionManager.cs
index ab5b97c..97d2591 100644
--- a/OpenSim/Region/Environment/Regions/RegionManager.cs
+++ b/OpenSim/Region/Environment/Regions/RegionSubscriptionManager.cs
@@ -4,11 +4,11 @@ using System.Text;
 

 namespace OpenSim.Region.Environment.Regions

 {

-    public class RegionManager

+    public class RegionSubscriptionManager

     {

         private Dictionary<uint, Region> m_regions;

 

-        public RegionManager( )

+        public RegionSubscriptionManager( )

         {

             m_regions = new Dictionary<uint, Region>( );

         }