1 files changed, 133 insertions, 64 deletions

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 5af8194..fcc8717 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -26,12 +26,14 @@
  */
 
 using System;
+using System.Threading;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Timers;
@@ -74,7 +76,7 @@ namespace OpenSim
 
         private string m_timedScript = "disabled";
         private int m_timeInterval = 1200;
-        private Timer m_scriptTimer;
+        private System.Timers.Timer m_scriptTimer;
 
         public OpenSim(IConfigSource configSource) : base(configSource)
         {
@@ -114,8 +116,8 @@ namespace OpenSim
                 if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod))
                     Util.FireAndForgetMethod = asyncCallMethod;
 
-                stpMinThreads = startupConfig.GetInt("MinPoolThreads", 15);
-                stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 300);
+                stpMinThreads = startupConfig.GetInt("MinPoolThreads", 2 );
+                stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 25);
                 m_consolePrompt = startupConfig.GetString("ConsolePrompt", @"Region (\R) ");
             }
 
@@ -123,8 +125,27 @@ namespace OpenSim
                 Util.InitThreadPool(stpMinThreads, stpMaxThreads);
 
             m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod);
+
+            m_log.InfoFormat("[OPENSIM MAIN] Running GC in {0} mode", GCSettings.IsServerGC ? "server":"workstation");
         }
 
+#if (_MONO)
+        private static Mono.Unix.UnixSignal[] signals;
+
+
+        private Thread signal_thread = new Thread (delegate ()
+        {
+            while (true)
+            {
+                // Wait for a signal to be delivered
+                int index = Mono.Unix.UnixSignal.WaitAny (signals, -1);
+
+                //Mono.Unix.Native.Signum signal = signals [index].Signum;
+                MainConsole.Instance.RunCommand("shutdown");
+            }
+        });       
+#endif
+
         /// <summary>
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
@@ -134,6 +155,27 @@ namespace OpenSim
             m_log.Info("========================= STARTING OPENSIM =========================");
             m_log.Info("====================================================================");
 
+#if (_MONO)
+            if(!Util.IsWindows())
+            {
+                try
+                {
+                    // linux mac os specifics
+                    signals = new Mono.Unix.UnixSignal[]
+                    {
+                        new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM)
+                    };
+                    signal_thread.IsBackground = true;
+                    signal_thread.Start();
+                }
+                catch (Exception e)
+                {
+                    m_log.Info("Could not set up UNIX signal handlers. SIGTERM will not");
+                    m_log.InfoFormat("shut down gracefully: {0}", e.Message);
+                    m_log.Debug("Exception was: ", e);
+                }
+            }
+#endif
             //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString());
             // http://msdn.microsoft.com/en-us/library/bb384202.aspx
             //GCSettings.LatencyMode = GCLatencyMode.Batch;
@@ -172,10 +214,12 @@ namespace OpenSim
             MainServer.Instance.AddStreamHandler(new OpenSim.XSimStatusHandler(this));
             if (userStatsURI != String.Empty)
                 MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this));
+            MainServer.Instance.AddStreamHandler(new OpenSim.SimRobotsHandler());
 
             if (managedStatsURI != String.Empty)
             {
                 string urlBase = String.Format("/{0}/", managedStatsURI);
+                StatsManager.StatsPassword = managedStatsPassword;
                 MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest);
                 m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
             }
@@ -217,7 +261,7 @@ namespace OpenSim
             // Start timer script (run a script every xx seconds)
             if (m_timedScript != "disabled")
             {
-                m_scriptTimer = new Timer();
+                m_scriptTimer = new System.Timers.Timer();
                 m_scriptTimer.Enabled = true;
                 m_scriptTimer.Interval = m_timeInterval*1000;
                 m_scriptTimer.Elapsed += RunAutoTimerScript;
@@ -238,55 +282,65 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("General", false, "change region",
                                           "change region <region name>",
-                                          "Change current console region", 
+                                          "Change current console region",
                                           ChangeSelectedRegion);
 
             m_console.Commands.AddCommand("Archiving", false, "save xml",
-                                          "save xml",
-                                          "Save a region's data in XML format", 
+                                          "save xml [<file name>]",
+                                          "Save a region's data in XML format",
                                           SaveXml);
 
             m_console.Commands.AddCommand("Archiving", false, "save xml2",
-                                          "save xml2",
-                                          "Save a region's data in XML2 format", 
+                                          "save xml2 [<file name>]",
+                                          "Save a region's data in XML2 format",
                                           SaveXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "load xml",
-                                          "load xml [-newIDs [<x> <y> <z>]]",
+                                          "load xml [<file name> [-newUID [<x> <y> <z>]]]",
                                           "Load a region's data from XML format",
                                           LoadXml);
 
             m_console.Commands.AddCommand("Archiving", false, "load xml2",
-                                          "load xml2",
-                                          "Load a region's data from XML2 format", 
+                                          "load xml2 [<file name>]",
+                                          "Load a region's data from XML2 format",
                                           LoadXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "save prims xml2",
                                           "save prims xml2 [<prim name> <file name>]",
-                                          "Save named prim to XML2", 
+                                          "Save named prim to XML2",
                                           SavePrimsXml2);
 
             m_console.Commands.AddCommand("Archiving", false, "load oar",
-                                          "load oar [--merge] [--skip-assets]"
+                                          "load oar [-m|--merge] [-s|--skip-assets]"
                                              + " [--default-user \"User Name\"]"
                                              + " [--force-terrain] [--force-parcels]"
                                              + " [--no-objects]"
-                                             + " [--rotation degrees] [--rotation-center \"<x,y,z>\"]"
-                                             + " [--displacement \"<x,y,z>\"]"                                             
+                                             + " [--rotation degrees]"
+                                             + " [--bounding-origin \"<x,y,z>\"]"
+                                             + " [--bounding-size \"<x,y,z>\"]"
+                                             + " [--displacement \"<x,y,z>\"]"
+                                             + " [-d|--debug]"
                                              + " [<OAR path>]",
                                           "Load a region's data from an OAR archive.",
                                           "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading).\n"
+                                            + "--skip-assets will load the OAR but ignore the assets it contains.\n"
                                             + "--default-user will use this user for any objects with an owner whose UUID is not found in the grid.\n"
-                                            + "--displacement will add this value to the position of every object loaded.\n"
                                             + "--force-terrain forces the loading of terrain from the oar (undoes suppression done by --merge).\n"
                                             + "--force-parcels forces the loading of parcels from the oar (undoes suppression done by --merge).\n"
                                             + "--no-objects suppresses the addition of any objects (good for loading only the terrain).\n"
                                             + "--rotation specified rotation to be applied to the oar. Specified in degrees.\n"
-                                            + "--rotation-center Location (relative to original OAR) to apply rotation. Default is <128,128,0>.\n"
-                                            + "--skip-assets will load the OAR but ignore the assets it contains.\n\n"
+                                            + "--bounding-origin will only place objects that after displacement and rotation fall within the bounding cube who's position starts at <x,y,z>. Defaults to <0,0,0>.\n"
+                                            + "--bounding-size specifies the size of the bounding cube. The default is the size of the destination region and cannot be larger than this.\n"
+                                            + "--displacement will add this value to the position of every object loaded.\n"
+                                            + "--debug forces the archiver to display messages about where each object is being placed.\n\n"
                                             + "The path can be either a filesystem location or a URI.\n"
-                                            + "  If this is not given then the command looks for an OAR named region.oar in the current directory.",
-                                          LoadOar);
+                                            + "  If this is not given then the command looks for an OAR named region.oar in the current directory."
+                                            + "  [--rotation-center \"<x,y,z>\"] used to be an option, now it does nothing and will be removed soon."
+                                            + "When an OAR is being loaded, operations are applied in this order:\n"
+                                            + "1: Rotation (around the incoming OARs region center)\n"
+                                            + "2: Cropping (a bounding cube with origin and size)\n"
+                                            + "3: Displacement (setting offset coordinates within the destination region)",
+                                          LoadOar); ;
 
             m_console.Commands.AddCommand("Archiving", false, "save oar",
                                           //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]",
@@ -307,12 +361,12 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Objects", false, "edit scale",
                                           "edit scale <name> <x> <y> <z>",
-                                          "Change the scale of a named prim", 
+                                          "Change the scale of a named prim",
                                           HandleEditScale);
 
             m_console.Commands.AddCommand("Objects", false, "rotate scene",
                                           "rotate scene <degrees> [centerX, centerY]",
-                                          "Rotates all scene objects around centerX, centerY (defailt 128, 128) (please back up your region before using)",
+                                          "Rotates all scene objects around centerX, centerY (default 128, 128) (please back up your region before using)",
                                           HandleRotateScene);
 
             m_console.Commands.AddCommand("Objects", false, "scale scene",
@@ -334,44 +388,44 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Users", false, "show users",
                                           "show users [full]",
-                                          "Show user data for users currently on the region", 
+                                          "Show user data for users currently on the region",
                                           "Without the 'full' option, only users actually on the region are shown."
                                             + "  With the 'full' option child agents of users in neighbouring regions are also shown.",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Comms", false, "show connections",
                                           "show connections",
-                                          "Show connection data", 
+                                          "Show connection data",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Comms", false, "show circuits",
                                           "show circuits",
-                                          "Show agent circuit data", 
+                                          "Show agent circuit data",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Comms", false, "show pending-objects",
                                           "show pending-objects",
-                                          "Show # of objects on the pending queues of all scene viewers", 
+                                          "Show # of objects on the pending queues of all scene viewers",
                                           HandleShow);
 
             m_console.Commands.AddCommand("General", false, "show modules",
                                           "show modules",
-                                          "Show module data", 
+                                          "Show module data",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Regions", false, "show regions",
                                           "show regions",
-                                          "Show region data", 
+                                          "Show region data",
                                           HandleShow);
-            
+
             m_console.Commands.AddCommand("Regions", false, "show ratings",
                                           "show ratings",
-                                          "Show rating data", 
+                                          "Show rating data",
                                           HandleShow);
 
             m_console.Commands.AddCommand("Objects", false, "backup",
                                           "backup",
-                                          "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.", 
+                                          "Persist currently unsaved object changes immediately instead of waiting for the normal persistence call.",
                                           RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "create region",
@@ -385,22 +439,22 @@ namespace OpenSim
 
             m_console.Commands.AddCommand("Regions", false, "restart",
                                           "restart",
-                                          "Restart the currently selected region(s) in this instance", 
+                                          "Restart the currently selected region(s) in this instance",
                                           RunCommand);
 
             m_console.Commands.AddCommand("General", false, "command-script",
                                           "command-script <script>",
-                                          "Run a command script from file", 
+                                          "Run a command script from file",
                                           RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "remove-region",
                                           "remove-region <name>",
-                                          "Remove a region from this simulator", 
+                                          "Remove a region from this simulator",
                                           RunCommand);
 
             m_console.Commands.AddCommand("Regions", false, "delete-region",
                                           "delete-region <name>",
-                                          "Delete a region from disk", 
+                                          "Delete a region from disk",
                                           RunCommand);
 
             m_console.Commands.AddCommand("Estates", false, "estate create",
@@ -431,7 +485,13 @@ namespace OpenSim
             {
                 RunCommandScript(m_shutdownCommandsFile);
             }
-            
+
+            if (m_timedScript != "disabled")
+            {
+                m_scriptTimer.Dispose();
+                m_timedScript = "disabled";
+            }
+
             base.ShutdownSpecific();
         }
 
@@ -451,7 +511,6 @@ namespace OpenSim
         private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi)
         {
             int now = Environment.TickCount & Int32.MaxValue;
-
             m_log.ErrorFormat(
                 "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago.  {3}",
                 twi.Thread.Name,
@@ -470,7 +529,7 @@ namespace OpenSim
         private void KickUserCommand(string module, string[] cmdparams)
         {
             bool force = false;
-            
+
             OptionSet options = new OptionSet().Add("f|force", delegate (string v) { force = v != null; });
 
             List<string> mainParams = options.Parse(cmdparams);
@@ -500,7 +559,7 @@ namespace OpenSim
                     if (alert != null)
                         presence.ControllingClient.Kick(alert);
                     else
-                        presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
+                        presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
 
                     presence.Scene.CloseAgent(presence.UUID, force);
                     break;
@@ -567,7 +626,7 @@ namespace OpenSim
                 MainConsole.Instance.Output(usage);
                 return;
             }
-            
+
             float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI);
             OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle);
 
@@ -579,7 +638,7 @@ namespace OpenSim
 
             Vector3 center = new Vector3(centerX, centerY, 0.0f);
 
-            SceneManager.ForEachSelectedScene(delegate(Scene scene) 
+            SceneManager.ForEachSelectedScene(delegate(Scene scene)
             {
                 scene.ForEachSOG(delegate(SceneObjectGroup sog)
                 {
@@ -731,8 +790,8 @@ namespace OpenSim
             CreateRegion(regInfo, true, out scene);
 
             if (changed)
-                    m_estateDataService.StoreEstateSettings(regInfo.EstateSettings);
-        
+                m_estateDataService.StoreEstateSettings(regInfo.EstateSettings);
+
             scene.Start();
         }
 
@@ -835,8 +894,8 @@ namespace OpenSim
         protected override void HandleRestartRegion(RegionInfo whichRegion)
         {
             base.HandleRestartRegion(whichRegion);
- 
-            // Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the 
+
+            // Where we are restarting multiple scenes at once, a previous call to RefreshPrompt may have set the
             // m_console.ConsoleScene to null (indicating all scenes).
             if (m_console.ConsoleScene != null && whichRegion.RegionName == ((Scene)m_console.ConsoleScene).Name)
                 SceneManager.TrySetCurrentScene(whichRegion.RegionName);
@@ -869,7 +928,7 @@ namespace OpenSim
                     {
                         agents = SceneManager.GetCurrentSceneAvatars();
                     }
-                
+
                     MainConsole.Instance.Output(String.Format("\nAgents connected: {0}\n", agents.Count));
 
                     MainConsole.Instance.Output(
@@ -915,7 +974,7 @@ namespace OpenSim
 
                 case "modules":
                     SceneManager.ForEachSelectedScene(
-                        scene => 
+                        scene =>
                         {
                             MainConsole.Instance.OutputFormat("Loaded region modules in {0} are:", scene.Name);
 
@@ -951,16 +1010,16 @@ namespace OpenSim
                     cdt.AddColumn("Ready?", 6);
                     cdt.AddColumn("Estate", ConsoleDisplayUtil.EstateNameSize);
                     SceneManager.ForEachScene(
-                        scene => 
-                        { 
-                            RegionInfo ri = scene.RegionInfo; 
+                        scene =>
+                        {
+                            RegionInfo ri = scene.RegionInfo;
                             cdt.AddRow(
-                                ri.RegionName, 
-                                ri.RegionID, 
-                                string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY), 
+                                ri.RegionName,
+                                ri.RegionID,
+                                string.Format("{0},{1}", ri.RegionLocX, ri.RegionLocY),
                                 string.Format("{0}x{1}", ri.RegionSizeX, ri.RegionSizeY),
-                                ri.InternalEndPoint.Port, 
-                                scene.Ready ? "Yes" : "No", 
+                                ri.InternalEndPoint.Port,
+                                scene.Ready ? "Yes" : "No",
                                 ri.EstateSettings.EstateName);
                         }
                     );
@@ -1028,15 +1087,25 @@ namespace OpenSim
             cdt.AddColumn("Circuit code", 12);
             cdt.AddColumn("Endpoint", 23);
             cdt.AddColumn("Active?", 7);
+            cdt.AddColumn("ChildAgent?", 7);
+            cdt.AddColumn("ping(ms)", 8);
 
             SceneManager.ForEachScene(
                 s => s.ForEachClient(
-                    c => cdt.AddRow(
-                        s.Name,
-                        c.Name,
-                        c.CircuitCode.ToString(),
-                        c.RemoteEndPoint.ToString(),                
-                        c.IsActive.ToString())));
+                    c =>
+                        {
+                            bool child = false;
+                            if(c.SceneAgent != null && c.SceneAgent.IsChildAgent)
+                                child = true;
+                            cdt.AddRow(
+                            s.Name,
+                            c.Name,
+                            c.CircuitCode.ToString(),
+                            c.RemoteEndPoint.ToString(),
+                            c.IsActive.ToString(),
+                            child.ToString(),
+                            c.PingTimeMS);
+                        }));
 
             MainConsole.Instance.Output(cdt.ToString());
         }
@@ -1048,7 +1117,7 @@ namespace OpenSim
         /// <param name="cmdparams"></param>
         protected void SavePrimsXml2(string module, string[] cmdparams)
         {
-            if (cmdparams.Length > 5)
+            if (cmdparams.Length > 4)
             {
                 SceneManager.SaveNamedPrimsToXml2(cmdparams[3], cmdparams[4]);
             }
@@ -1067,7 +1136,7 @@ namespace OpenSim
         {
             MainConsole.Instance.Output("PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon.  If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason.");
 
-            if (cmdparams.Length > 0)
+            if (cmdparams.Length > 2)
             {
                 SceneManager.SaveCurrentSceneToXml(cmdparams[2]);
             }