Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

4 files changed, 65 insertions, 24 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index c08da18..4ef0b1b 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -390,19 +390,6 @@ namespace OpenSim
             // Prims have to be loaded after module configuration since some modules may be invoked during the load
             scene.LoadPrimsFromStorage(regionInfo.originRegionID);
             
-            if (scene.SnmpService != null)
-            {
-                scene.SnmpService.BootInfo("Creating region texture", scene);
-            }
-
-            // moved these here as the map texture has to be created after the modules are initialized
-            // and has to happen before the region is registered with the grid.
-            IWorldMapModule mapModule = scene.RequestModuleInterface<IWorldMapModule>();
-            if (mapModule != null)
-                mapModule.GenerateMaptile();
-            else
-                m_log.WarnFormat("[STARTUP]: No map module available to generate map tile");
-            
             // TODO : Try setting resource for region xstats here on scene
             MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); 
             
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 18ea865..ab18c93 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2218,7 +2218,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (root == null)
             {
-                m_log.DebugFormat("[LINK]: Can't find linkset root prim {0{", parentPrimId);
+                m_log.DebugFormat("[LINK]: Can't find linkset root prim {0}", parentPrimId);
                 return;
             }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 73472a9..98c46bd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -411,6 +411,9 @@ namespace OpenSim.Region.Framework.Scenes
         private double m_rootReprioritizationDistance = 10.0;
         private double m_childReprioritizationDistance = 20.0;
 
+        private Timer m_mapGenerationTimer = new Timer();
+        bool m_generateMaptiles = false;
+
         #endregion
 
         #region Properties
@@ -665,6 +668,29 @@ namespace OpenSim.Region.Framework.Scenes
 
                 m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
                 CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
+
+                m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
+                if (m_generateMaptiles)
+                {
+                    int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
+                    if (maptileRefresh != 0)
+                    {
+                        m_mapGenerationTimer.Interval = maptileRefresh * 1000;
+                        m_mapGenerationTimer.Elapsed += RegenerateMaptile;
+                        m_mapGenerationTimer.AutoReset = true;
+                        m_mapGenerationTimer.Start();
+                    }
+                }
+                else
+                {
+                    string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
+                    UUID tileID;
+
+                    if (UUID.TryParse(tile, out tileID))
+                    {
+                        RegionInfo.RegionSettings.TerrainImageID = tileID;
+                    }
+                }
             }
             catch
             {
@@ -1694,16 +1720,21 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_sceneGridService.SetScene(this);
 
-            // These two 'commands' *must be* next to each other or sim rebooting fails.
-            //m_sceneGridService.RegisterRegion(m_interregionCommsOut, RegionInfo);
-
-            GridRegion region = new GridRegion(RegionInfo);
-            string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
-            if (error != String.Empty)
+            // If we generate maptiles internally at all, the maptile generator
+            // will register the region. If not, do it here
+            if (m_generateMaptiles)
             {
-                throw new Exception(error);
+                RegenerateMaptile(null, null);
+            }
+            else
+            {
+                GridRegion region = new GridRegion(RegionInfo);
+                string error = GridService.RegisterRegion(RegionInfo.ScopeID, region);
+                if (error != String.Empty)
+                {
+                    throw new Exception(error);
+                }
             }
-
         }
 
         #endregion
@@ -4995,5 +5026,19 @@ namespace OpenSim.Region.Framework.Scenes
 
             return offsets.ToArray();
         }
+
+        public void RegenerateMaptile(object sender, ElapsedEventArgs e)
+        {
+            IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>();
+            if (mapModule != null)
+            {
+                mapModule.GenerateMaptile();
+
+                string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo));
+
+                if (error != String.Empty)
+                    throw new Exception(error);
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 76ade1f..22a81ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3780,6 +3780,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             UUID invItemID = InventorySelf();
+            UUID targetID;
+
+            if (!UUID.TryParse(target, out targetID))
+                return;
 
             TaskInventoryItem item;
             m_host.TaskInventory.LockItemsForRead(true);
@@ -3798,7 +3802,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (sp != null)
                 client = sp.ControllingClient;
 
-            SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)target);
+            SceneObjectPart targetPart = World.GetSceneObjectPart((UUID)targetID);
 
             if (targetPart.ParentGroup.RootPart.AttachmentPoint != 0)
                 return; // Fail silently if attached
@@ -9143,7 +9147,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                 string reply = String.Empty;
 
-                GridRegion info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator);
+                GridRegion info;
+
+                if (m_ScriptEngine.World.RegionInfo.RegionName == simulator)
+                    info = new GridRegion(m_ScriptEngine.World.RegionInfo);
+                else
+                    info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator);
 
                 switch (data)
                 {