Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 62 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 7b11658..8946b5c 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -31,6 +31,7 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.World.WorldMap;
@@ -48,20 +49,63 @@ namespace OpenSim.Region.CoreModules.Hypergrid
         // Remember the map area that each client has been exposed to in this region
         private Dictionary<UUID, List<MapBlockData>> m_SeenMapBlocks = new Dictionary<UUID, List<MapBlockData>>();
 
+        private string m_MapImageServerURL = string.Empty;
+
+        private IUserManagement m_UserManagement;
+
         #region INonSharedRegionModule Members
 
-        public override void Initialise(IConfigSource config)
+        public override void Initialise(IConfigSource source)
         {
             if (Util.GetConfigVarFromSections<string>(
-                config, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap")
+                source, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap")
+            {
                 m_Enabled = true;
+
+                m_MapImageServerURL = Util.GetConfigVarFromSections<string>(source, "MapTileURL", new string[] {"LoginService", "HGWorldMap", "SimulatorFeatures"});
+
+                if (!string.IsNullOrEmpty(m_MapImageServerURL))
+                {
+                    m_MapImageServerURL = m_MapImageServerURL.Trim();
+                    if (!m_MapImageServerURL.EndsWith("/"))
+                        m_MapImageServerURL = m_MapImageServerURL + "/";
+                }
+
+
+            }
         }
 
         public override void AddRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             base.AddRegion(scene);
 
-            scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed);
+            scene.EventManager.OnClientClosed += EventManager_OnClientClosed;
+        }
+
+        public override void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            base.RegionLoaded(scene);
+            ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+
+            m_UserManagement = m_scene.RequestModuleInterface<IUserManagement>();
+
+        }
+
+        public override void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.EventManager.OnClientClosed -= EventManager_OnClientClosed;
         }
 
         public override string Name
@@ -85,7 +129,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
                         b.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's
                     }
 
-                    m_log.DebugFormat("[HG MAP]: Reseting {0} blocks", mapBlocks.Count);
+                    m_log.DebugFormat("[HG MAP]: Resetting {0} blocks", mapBlocks.Count);
                     sp.ControllingClient.SendMapBlock(mapBlocks, 0);
                     m_SeenMapBlocks.Remove(clientID);
                 }
@@ -115,6 +159,20 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             return mapBlocks;
         }
 
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            if (m_UserManagement != null && !string.IsNullOrEmpty(m_MapImageServerURL) && !m_UserManagement.IsLocalGridUser(agentID))
+            {
+                OSD extras = new OSDMap();
+                if (features.ContainsKey("OpenSimExtras"))
+                    extras = features["OpenSimExtras"];
+                else
+                    features["OpenSimExtras"] = extras;
+
+                ((OSDMap)extras)["map-server-url"] = m_MapImageServerURL;
+
+            }
+        }
     }
 
     class MapArea