4 files changed, 46 insertions, 7 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
index e8387e3..1f229c0 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
@@ -104,8 +104,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID) && !m_scene.Permissions.IsGod(agentID))
-                return;
+//            if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(agentID) && !m_scene.Permissions.IsGod(agentID))
+//                return;
 
             UUID capID = UUID.Random();
 
@@ -191,6 +191,12 @@ namespace OpenSim.Region.ClientStack.Linden
 
             OSD osd = OSDParser.DeserializeLLSDXml(message);
 
+            if (!m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(m_agentID) && !m_isGod)
+            {
+                m_consoleModule.SendConsoleOutput(m_agentID, "No access");
+                return new byte[0];
+            }
+
             string cmd = osd.AsString();
             if (cmd == "set console on")
             {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0312262..7668a87 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1775,6 +1775,30 @@ namespace OpenSim.Region.Framework.Scenes
 
                             // Region ready should always be set
                             Ready = true;
+
+
+                            IConfig restartConfig = m_config.Configs["RestartModule"];
+                            if (restartConfig != null)
+                            {
+                                string markerPath = restartConfig.GetString("MarkerPath", String.Empty);
+
+                                if (markerPath != String.Empty)
+                                {
+                                    string path = Path.Combine(markerPath, RegionInfo.RegionID.ToString() + ".ready");
+                                    try
+                                    {
+                                        string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
+                                        FileStream fs = File.Create(path);
+                                        System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+                                        Byte[] buf = enc.GetBytes(pidstring);
+                                        fs.Write(buf, 0, buf.Length);
+                                        fs.Close();
+                                    }
+                                    catch (Exception)
+                                    {
+                                    }
+                                }
+                            }
                         }
                         else
                         {
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
index 1ae669c..017927a 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -98,11 +98,20 @@ namespace OpenSim.Server.Handlers.MapImage
 //            UUID scopeID = new UUID("07f8d88e-cd5e-4239-a0ed-843f75d09992");
             UUID scopeID = UUID.Zero;
 
+            // This will be map/tilefile.ext, but on multitenancy it will be
+            // map/scope/teilefile.ext
             string[] bits = path.Trim('/').Split(new char[] {'/'});
-            if (bits.Length > 1)
+            if (bits.Length > 2)
             {
-                scopeID = new UUID(bits[0]);
-                path = bits[1];
+                try
+                {
+                    scopeID = new UUID(bits[1]);
+                }
+                catch
+                {
+                    return new byte[9];
+                }
+                path = bits[2];
             }
             result = m_MapService.GetMapTile(path.Trim('/'), scopeID, out format);
             if (result.Length > 0)
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index c90f5bd..30d3e41 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Services.MapImageService
 
         public byte[] GetMapTile(string fileName, UUID scopeID, out string format)
         {
-//            m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName);
+            //m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName);
 
             format = ".jpg";
             string fullName = Path.Combine(m_TilesStoragePath, scopeID.ToString());
@@ -256,7 +256,7 @@ namespace OpenSim.Services.MapImageService
             }
             else
             {
-                m_log.DebugFormat("[MAP IMAGE SERVICE]: unable to get file {0}", fileName);
+                //m_log.DebugFormat("[MAP IMAGE SERVICE]: unable to get file {0}", fileName);
                 return new byte[0];
             }
         }