* First example of moving stuff to a Region layer

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

1 files changed, 32 insertions, 3 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);                

+            }

         }

     }

 }