Merge branch 'master' into careminster-presence-refactor

3 files changed, 94 insertions, 22 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ca29a7c..e8f18e7 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -244,7 +244,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             }
             catch (Exception e)
             {
-                m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace);
+                m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0} {1}", e.Message, e.StackTrace);
                 sp.ControllingClient.SendTeleportFailed("Internal error");
             }
         }
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
index 14f5b1e..f6d1a82 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
@@ -30,21 +30,29 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Security;
+using System.Text;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.World.Estate
 {
+    /// <summary>
+    /// Estate management console commands.
+    /// </summary>
     public class EstateManagementCommands
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         protected EstateManagementModule m_module;
         
+        protected Commander m_commander = new Commander("estate");
+        
         public EstateManagementCommands(EstateManagementModule module)
         {
             m_module = module;
@@ -52,20 +60,60 @@ namespace OpenSim.Region.CoreModules.World.Estate
         
         public void Initialise()
         {            
-            m_module.Scene.AddCommand(this, "set terrain texture",
+            m_log.DebugFormat("[ESTATE MODULE]: Setting up estate commands for region {0}", m_module.Scene.RegionInfo.RegionName);
+            
+            m_module.Scene.AddCommand(m_module, "set terrain texture",
                                "set terrain texture <number> <uuid> [<x>] [<y>]",
                                "Sets the terrain <number> to <uuid>, if <x> or <y> are specified, it will only " +
                                "set it on regions with a matching coordinate. Specify -1 in <x> or <y> to wildcard" +
                                " that coordinate.",
                                consoleSetTerrainTexture);
 
-            m_module.Scene.AddCommand(this, "set terrain heights",
+            m_module.Scene.AddCommand(m_module, "set terrain heights",
                                "set terrain heights <corner> <min> <max> [<x>] [<y>]",
                                "Sets the terrain texture heights on corner #<corner> to <min>/<max>, if <x> or <y> are specified, it will only " +
                                "set it on regions with a matching coordinate. Specify -1 in <x> or <y> to wildcard" +
                                " that coordinate. Corner # SW = 0, NW = 1, SE = 2, NE = 3.",
                                consoleSetTerrainHeights);            
-        }          
+            
+            Command showCommand 
+                = new Command("show", CommandIntentions.COMMAND_STATISTICAL, ShowEstatesCommand, "Shows all estates on the simulator.");
+
+            m_commander.RegisterCommand("show", showCommand);
+
+            m_module.Scene.RegisterModuleCommander(m_commander);            
+            
+            m_module.Scene.EventManager.OnPluginConsole += EventManagerOnPluginConsole;
+        }       
+        
+        public void Close()
+        {
+            m_module.Scene.EventManager.OnPluginConsole -= EventManagerOnPluginConsole;
+            m_module.Scene.UnregisterModuleCommander(m_commander.Name);            
+        }
+        
+        /// <summary>
+        /// Processes commandline input. Do not call directly.
+        /// </summary>
+        /// <param name="args">Commandline arguments</param>
+        protected void EventManagerOnPluginConsole(string[] args)
+        {
+            if (args[0] == "estate")
+            {
+                if (args.Length == 1)
+                {
+                    m_commander.ProcessConsoleCommand("help", new string[0]);
+                    return;
+                }
+
+                string[] tmpArgs = new string[args.Length - 2];
+                int i;
+                for (i = 2; i < args.Length; i++)
+                    tmpArgs[i - 2] = args[i];
+
+                m_commander.ProcessConsoleCommand(args[1], tmpArgs);
+            }
+        }            
         
         protected void consoleSetTerrainTexture(string module, string[] args)
         {
@@ -152,5 +200,25 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
             }
         }     
+        
+        protected void ShowEstatesCommand(Object[] args)
+        {
+            StringBuilder report = new StringBuilder();  
+            RegionInfo ri = m_module.Scene.RegionInfo;
+            EstateSettings es = ri.EstateSettings;
+            
+            report.AppendFormat("Estate information for region {0}\n", ri.RegionName);            
+            report.AppendFormat(
+                "{0,-20} {1,-7} {2,-20}\n",
+                "Estate Name",
+                "ID",
+                "Owner");
+            
+            report.AppendFormat(
+                "{0,-20} {1,-7} {2,-20}\n", 
+                es.EstateName, es.EstateID, m_module.UserManager.GetUserName(es.EstateOwner));
+            
+            MainConsole.Instance.Output(report.ToString());
+        }         
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 0652ca7..34d0cfc 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -32,6 +32,7 @@ using System.Reflection;
 using System.Security;
 using System.Timers;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -40,7 +41,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.World.Estate
 {
-    public class EstateManagementModule : IEstateModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EstateManagementModule")]
+    public class EstateManagementModule : IEstateModule, INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -48,8 +50,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private Timer m_regionChangeTimer = new Timer();
         public Scene Scene { get; private set; }
+        public IUserManagement UserManager { get; private set; }
         
-        protected EstateManagementCommands m_commands;
+        protected EstateManagementCommands m_commands;                
 
         private EstateTerrainXferHandler TerrainUploader;
 
@@ -909,9 +912,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
         #endregion
 
         #region IRegionModule Members
+        
+        public string Name { get { return "EstateManagementModule"; } }
+        
+        public Type ReplaceableInterface { get { return null; } }        
 
-        public void Initialise(Scene scene, IConfigSource source)
-        {            
+        public void Initialise(IConfigSource source) {}
+        
+        public void AddRegion(Scene scene)
+        {
             m_regionChangeTimer.AutoReset = false;
             m_regionChangeTimer.Interval = 2000;
             m_regionChangeTimer.Elapsed += RaiseRegionInfoChange;
@@ -924,26 +933,21 @@ namespace OpenSim.Region.CoreModules.World.Estate
             m_commands = new EstateManagementCommands(this);
             m_commands.Initialise();
         }
-
-        public void PostInitialise()
+        
+        public void RemoveRegion(Scene scene) {}            
+        
+        public void RegionLoaded(Scene scene)
         {
             // Sets up the sun module based no the saved Estate and Region Settings
             // DO NOT REMOVE or the sun will stop working
-            Scene.TriggerEstateSunUpdate();
-        }
-
-        public void Close()
-        {
-        }
-
-        public string Name
-        {
-            get { return "EstateManagementModule"; }
+            scene.TriggerEstateSunUpdate();
+            
+            UserManager = scene.RequestModuleInterface<IUserManagement>();            
         }
 
-        public bool IsSharedModule
+        public void Close() 
         {
-            get { return false; }
+            m_commands.Close();
         }
 
         #endregion