Dump OpenSim 0.9.0.1 into it's own branch.

7 files changed, 356 insertions, 169 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index bf34419..66ce8e5 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -74,7 +74,16 @@ namespace OpenSim
             AppDomain.CurrentDomain.UnhandledException +=
                 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
 
-            ServicePointManager.DefaultConnectionLimit = 12;
+            if(Util.IsWindows())
+                ServicePointManager.DefaultConnectionLimit = 32;
+            else
+            {
+                ServicePointManager.DefaultConnectionLimit = 12;
+            }
+
+            try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { }
+            ServicePointManager.Expect100Continue = false;
+            ServicePointManager.UseNagleAlgorithm = false;
 
             // Add the arguments supplied when running the application to the configuration
             ArgvConfigSource configSource = new ArgvConfigSource(args);
@@ -85,9 +94,9 @@ namespace OpenSim
             if (logConfigFile != String.Empty)
             {
                 XmlConfigurator.Configure(new System.IO.FileInfo(logConfigFile));
-                m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file", 
+                m_log.InfoFormat("[OPENSIM MAIN]: configured log4net using \"{0}\" as configuration file",
                                  logConfigFile);
-            } 
+            }
             else
             {
                 XmlConfigurator.Configure();
@@ -103,22 +112,22 @@ namespace OpenSim
                 "[OPENSIM MAIN]: Environment variable MONO_THREADS_PER_CPU is {0}", monoThreadsPerCpu ?? "unset");
 
             // Verify the Threadpool allocates or uses enough worker and IO completion threads
-                        // .NET 2.0, workerthreads default to 50 *  numcores
-                        // .NET 3.0, workerthreads defaults to 250 * numcores
-                        // .NET 4.0, workerthreads are dynamic based on bitness and OS resources
+            // .NET 2.0, workerthreads default to 50 *  numcores
+            // .NET 3.0, workerthreads defaults to 250 * numcores
+            // .NET 4.0, workerthreads are dynamic based on bitness and OS resources
             // Max IO Completion threads are 1000 on all 3 CLRs
             //
             // Mono 2.10.9 to at least Mono 3.1, workerthreads default to 100 * numcores, iocp threads to 4 * numcores
-                        int workerThreadsMin = 500;
-                        int workerThreadsMax = 1000; // may need further adjustment to match other CLR
-                        int iocpThreadsMin = 1000;
-                        int iocpThreadsMax = 2000; // may need further adjustment to match other CLR
+            int workerThreadsMin = 500;
+            int workerThreadsMax = 1000; // may need further adjustment to match other CLR
+            int iocpThreadsMin = 1000;
+            int iocpThreadsMax = 2000; // may need further adjustment to match other CLR
 
             {
                 int currentMinWorkerThreads, currentMinIocpThreads;
                 System.Threading.ThreadPool.GetMinThreads(out currentMinWorkerThreads, out currentMinIocpThreads);
                 m_log.InfoFormat(
-                    "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads", 
+                    "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads",
                     currentMinWorkerThreads, currentMinIocpThreads);
             }
 
@@ -137,30 +146,30 @@ namespace OpenSim
                 m_log.InfoFormat("[OPENSIM MAIN]: Limiting max worker threads to {0}",workerThreads);
             }
 
-                        // Increase the number of IOCP threads available.
-                        // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
-                        if (iocpThreads < iocpThreadsMin)
+            // Increase the number of IOCP threads available.
+            // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
+            if (iocpThreads < iocpThreadsMin)
             {
                 iocpThreads = iocpThreadsMin;
                 m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max IOCP threads to {0}",iocpThreads);
             }
-                        // Make sure we don't overallocate IOCP threads and thrash system resources
+            // Make sure we don't overallocate IOCP threads and thrash system resources
             if ( iocpThreads > iocpThreadsMax )
             {
                 iocpThreads = iocpThreadsMax;
                 m_log.InfoFormat("[OPENSIM MAIN]: Limiting max IOCP completion threads to {0}",iocpThreads);
             }
-                        // set the resulting worker and IO completion thread counts back to ThreadPool
+            // set the resulting worker and IO completion thread counts back to ThreadPool
             if ( System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads) )
-                        {
-                    m_log.InfoFormat(
+            {
+                m_log.InfoFormat(
                     "[OPENSIM MAIN]: Threadpool set to {0} max worker threads and {1} max IOCP threads",
                     workerThreads, iocpThreads);
-                        }
-                        else
-                        {
-                    m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");                         
-                        }
+            }
+            else
+            {
+                m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");
+            }
 
             // Check if the system is compatible with OpenSimulator.
             // Ensures that the minimum system requirements are met
@@ -178,7 +187,7 @@ namespace OpenSim
             Culture.SetCurrentCulture();
 
             // Validate that the user has the most basic configuration done
-            // If not, offer to do the most basic configuration for them warning them along the way of the importance of 
+            // If not, offer to do the most basic configuration for them warning them along the way of the importance of
             // reading these files.
             /*
             m_log.Info("Checking for reguired configuration...\n");
@@ -187,13 +196,13 @@ namespace OpenSim
                                || (File.Exists(Path.Combine(Util.configDir(), "opensim.ini")))
                                || (File.Exists(Path.Combine(Util.configDir(), "openSim.ini")))
                                || (File.Exists(Path.Combine(Util.configDir(), "Opensim.ini")));
-            
+
             bool StanaloneCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "StandaloneCommon.ini"));
             bool StanaloneCommon_lowercased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "standalonecommon.ini"));
             bool GridCommon_ProperCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "GridCommon.ini"));
             bool GridCommon_lowerCased = File.Exists(Path.Combine(Path.Combine(Util.configDir(), "config-include"), "gridcommon.ini"));
 
-            if ((OpenSim_Ini) 
+            if ((OpenSim_Ini)
                 && (
                 (StanaloneCommon_ProperCased
                 || StanaloneCommon_lowercased
@@ -211,7 +220,7 @@ namespace OpenSim
                                         "yes");
                 if (resp == "yes")
                 {
-                    
+
                         if (!(OpenSim_Ini))
                         {
                             try
@@ -311,7 +320,7 @@ namespace OpenSim
             m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false);
 
             // load Crash directory config
-            m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);           
+            m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
 
             if (background)
             {
@@ -319,9 +328,9 @@ namespace OpenSim
                 m_sim.Startup();
             }
             else
-            {                       
+            {
                 m_sim = new OpenSim(configSource);
-                          
+
                 m_sim.Startup();
 
                 while (true)
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index cf7db97..62bd4f4 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -43,10 +43,10 @@ namespace OpenSim
     public class ConfigurationLoader
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         /// <summary>
         /// Various Config settings the region needs to start
-        /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor, 
+        /// Physics Engine, Mesh Engine, GridMode, PhysicsPrim allowed, Neighbor,
         /// StorageDLL, Storage Connection String, Estate connection String, Client Stack
         /// Standalone settings.
         /// </summary>
@@ -154,14 +154,15 @@ namespace OpenSim
             }
 
             // Override distro settings with contents of inidirectory
-            string iniDirPath = Path.GetFullPath(Path.Combine(Util.configDir(), startupConfig.GetString("inidirectory", "config")));
+            string iniDirName = startupConfig.GetString("inidirectory", "config");
+            string iniDirPath = Path.Combine(Util.configDir(), iniDirName);
 
             if (Directory.Exists(iniDirPath))
             {
                 m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath);
                 List<string> overrideSources = new List<string>();
 
-                string[] fileEntries = Directory.GetFiles(iniDirPath);
+                string[] fileEntries = Directory.GetFiles(iniDirName);
                 foreach (string filePath in fileEntries)
                 {
                     if (Path.GetExtension(filePath).ToLower() == ".ini")
@@ -187,7 +188,7 @@ namespace OpenSim
                         {
                             iniFileExists = true;
                             AddIncludes(overrideConfig, overrideSources);
-                        } 
+                        }
                     }
                     m_config.Source.Merge(overrideConfig.Source);
                 }
@@ -197,7 +198,7 @@ namespace OpenSim
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
                 Environment.Exit(1);
-            } 
+            }
             else if (!iniFileExists)
             {
                 m_log.FatalFormat("[CONFIG]: Could not load any configuration");
@@ -256,14 +257,14 @@ namespace OpenSim
                             string path = Path.Combine(basepath, chunkWithoutWildcards);
                             path = Path.GetFullPath(path) + chunkWithWildcards;
                             string[] paths = Util.Glob(path);
-                            
+
                             // If the include path contains no wildcards, then warn the user that it wasn't found.
                             if (wildcardIndex == -1 && paths.Length == 0)
                             {
                                 m_log.WarnFormat("[CONFIG]: Could not find include file {0}", path);
                             }
                             else
-                            {                            
+                            {
                                 foreach (string p in paths)
                                 {
                                     if (!sources.Contains(p))
@@ -347,13 +348,10 @@ namespace OpenSim
                 config.Set("meshing", "Meshmerizer");
                 config.Set("physical_prim", true);
                 config.Set("serverside_object_permissions", true);
-                config.Set("storage_prim_inventories", true);
                 config.Set("startup_console_commands_file", String.Empty);
                 config.Set("shutdown_console_commands_file", String.Empty);
                 config.Set("DefaultScriptEngine", "XEngine");
                 config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
-                // life doesn't really work without this
-                config.Set("EventQueue", true);
             }
 
             {
@@ -379,11 +377,11 @@ namespace OpenSim
                 m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
                 m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
 
-                m_configSettings.ClientstackDll 
+                m_configSettings.ClientstackDll
                     = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
             }
 
             m_networkServersInfo.loadFromConfiguration(m_config.Source);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index a3fa66c..ff3f5d7 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -43,7 +43,7 @@ namespace OpenSim
         void Initialise(OpenSimBase openSim);
 
         /// <summary>
-        /// Called when the application loading is completed 
+        /// Called when the application loading is completed
         /// </summary>
         void PostInitialise();
     }
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]);
             }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index ab6f036..9f349c0 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -85,9 +85,10 @@ namespace OpenSim
 
         protected string proxyUrl;
         protected int proxyOffset = 0;
-        
+
         public string userStatsURI = String.Empty;
         public string managedStatsURI = String.Empty;
+        public string managedStatsPassword = String.Empty;
 
         protected bool m_autoCreateClientStack = true;
 
@@ -110,6 +111,10 @@ namespace OpenSim
 
         public List<IApplicationPlugin> m_plugins = new List<IApplicationPlugin>();
 
+        private List<string> m_permsModules;
+
+        private bool m_securePermissionsLoading = true;
+
         /// <value>
         /// The config information passed into the OpenSimulator region server.
         /// </value>
@@ -121,7 +126,7 @@ namespace OpenSim
         {
             get { return m_EnvConfigSource; }
         }
-       
+
         public uint HttpServerPort
         {
             get { return m_httpServerPort; }
@@ -206,7 +211,7 @@ namespace OpenSim
         }
 
         /// <summary>
-        /// Performs startup specific to the region server, including initialization of the scene 
+        /// Performs startup specific to the region server, including initialization of the scene
         /// such as loading configuration from disk.
         /// </summary>
         protected override void StartupSpecific()
@@ -214,12 +219,28 @@ namespace OpenSim
             IConfig startupConfig = Config.Configs["Startup"];
             if (startupConfig != null)
             {
+                // refuse to run MegaRegions
+                if(startupConfig.GetBoolean("CombineContiguousRegions", false))
+                {
+                    m_log.Fatal("CombineContiguousRegions (MegaRegions) option is no longer suported. Use a older version to save region contents as OAR, then import into a fresh install of this new version");
+                    throw new Exception("CombineContiguousRegions not suported");
+                }
+
                 string pidFile = startupConfig.GetString("PIDFile", String.Empty);
                 if (pidFile != String.Empty)
                     CreatePIDFile(pidFile);
-                
+
                 userStatsURI = startupConfig.GetString("Stats_URI", String.Empty);
+
+                m_securePermissionsLoading = startupConfig.GetBoolean("SecurePermissionsLoading", true);
+
+                string permissionModules = Util.GetConfigVarFromSections<string>(Config, "permissionmodules",
+                    new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule");
+
+                m_permsModules =  new List<string>(permissionModules.Split(',').Select(m => m.Trim()));
+
                 managedStatsURI = startupConfig.GetString("ManagedStatsRemoteFetchURI", String.Empty);
+                managedStatsPassword = startupConfig.GetString("ManagedStatsRemoteFetchPassword", String.Empty);
             }
 
             // Load the simulation data service
@@ -235,11 +256,11 @@ namespace OpenSim
             if (m_simulationDataService == null)
                 throw new Exception(
                     string.Format(
-                        "Could not load an ISimulationDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [SimulationDataStore] config section.", 
+                        "Could not load an ISimulationDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [SimulationDataStore] config section.",
                         module));
 
             // Load the estate data service
-            module = Util.GetConfigVarFromSections<string>(Config, "LocalServiceModule", new string[]{"EstateDataStore", "EstateService"}, String.Empty); 
+            module = Util.GetConfigVarFromSections<string>(Config, "LocalServiceModule", new string[]{"EstateDataStore", "EstateService"}, String.Empty);
             if (String.IsNullOrEmpty(module))
                 throw new Exception("Configuration file is missing the LocalServiceModule parameter in the [EstateDataStore] or [EstateService] section");
 
@@ -249,7 +270,7 @@ namespace OpenSim
                 if (m_estateDataService == null)
                     throw new Exception(
                         string.Format(
-                            "Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.", 
+                            "Could not load an IEstateDataService implementation from {0}, as configured in the LocalServiceModule parameter of the [EstateDataStore] config section.",
                             module));
             }
 
@@ -386,9 +407,9 @@ namespace OpenSim
             // set initial ServerURI
             regionInfo.HttpPort = m_httpServerPort;
             regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort.ToString() + "/";
-            
+
             regionInfo.osSecret = m_osSecret;
-            
+
             if ((proxyUrl.Length > 0) && (portadd_flag))
             {
                 // set proxy url to RegionInfo
@@ -410,19 +431,48 @@ namespace OpenSim
             }
             else m_log.Error("[REGIONMODULES]: The new RegionModulesController is missing...");
 
+            if (m_securePermissionsLoading)
+            {
+                foreach (string s in m_permsModules)
+                {
+                    if (!scene.RegionModules.ContainsKey(s))
+                    {
+                        m_log.Fatal("[MODULES]: Required module " + s + " not found.");
+                        Environment.Exit(0);
+                    }
+                }
+
+                m_log.InfoFormat("[SCENE]: Secure permissions loading enabled, modules loaded: {0}", String.Join(" ", m_permsModules.ToArray()));
+            }
+
             scene.SetModuleInterfaces();
+// First Step of bootreport sequence
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.ColdStart(1,scene);
+                scene.SnmpService.LinkDown(scene);
+            }
+
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("Loading prims", scene);
+            }
 
             while (regionInfo.EstateSettings.EstateOwner == UUID.Zero && MainConsole.Instance != null)
                 SetUpEstateOwner(scene);
 
+            scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
+
             // Prims have to be loaded after module configuration since some modules may be invoked during the load
             scene.LoadPrimsFromStorage(regionInfo.originRegionID);
-            
+
             // TODO : Try setting resource for region xstats here on scene
             MainServer.Instance.AddStreamHandler(new RegionStatsHandler(regionInfo));
-            
-            scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID);
-            scene.EventManager.TriggerParcelPrimCountUpdate();
+
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("Grid Registration in progress", scene);
+            }
 
             try
             {
@@ -431,18 +481,32 @@ namespace OpenSim
             catch (Exception e)
             {
                 m_log.ErrorFormat(
-                    "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}", 
+                    "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}",
                     e.Message, e.StackTrace);
 
+                if (scene.SnmpService != null)
+                {
+                    scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene);
+                }
                 // Carrying on now causes a lot of confusion down the
                 // line - we need to get the user's attention
                 Environment.Exit(1);
             }
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("Grid Registration done", scene);
+            }
+
             // We need to do this after we've initialized the
             // scripting engines.
             scene.CreateScriptInstances();
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("ScriptEngine started", scene);
+            }
+
             SceneManager.Add(scene);
 
             //if (m_autoCreateClientStack)
@@ -454,10 +518,20 @@ namespace OpenSim
             //    }
             //}
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("Initializing region modules", scene);
+            }
             scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); };
 
             mscene = scene;
 
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("The region is operational", scene);
+                scene.SnmpService.LinkUp(scene);
+            }
+
             //return clientServers;
         }
 
@@ -535,7 +609,7 @@ namespace OpenSim
 
                     if (rawEstateOwnerUuid == null)
                         rawEstateOwnerUuid = MainConsole.Instance.CmdPrompt("User ID", UUID.Random().ToString());
-        
+
                     UUID estateOwnerUuid = UUID.Zero;
                     if (!UUID.TryParse(rawEstateOwnerUuid, out estateOwnerUuid))
                     {
@@ -573,6 +647,11 @@ namespace OpenSim
         private void ShutdownRegion(Scene scene)
         {
             m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName);
+            if (scene.SnmpService != null)
+            {
+                scene.SnmpService.BootInfo("The region is shutting down", scene);
+                scene.SnmpService.LinkDown(scene);
+            }
             IRegionModulesController controller;
             if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller))
             {
@@ -593,7 +672,7 @@ namespace OpenSim
             scene.DeleteAllSceneObjects();
             SceneManager.CloseScene(scene);
             //ShutdownClientServer(scene.RegionInfo);
-            
+
             if (!cleanup)
                 return;
 
@@ -655,7 +734,7 @@ namespace OpenSim
             SceneManager.CloseScene(scene);
             //ShutdownClientServer(scene.RegionInfo);
         }
-        
+
         /// <summary>
         /// Remove a region from the simulator without deleting it permanently.
         /// </summary>
@@ -667,7 +746,7 @@ namespace OpenSim
             if (SceneManager.TryGetScene(name, out target))
                 CloseRegion(target);
         }
-        
+
         /// <summary>
         /// Create a scene and its initial base structures.
         /// </summary>
@@ -703,15 +782,15 @@ namespace OpenSim
             IEstateDataService estateDataService, AgentCircuitManager circuitManager)
         {
             return new Scene(
-                regionInfo, circuitManager,  
+                regionInfo, circuitManager,
                 simDataService, estateDataService,
                 Config, m_version);
         }
-        
+
         protected virtual void HandleRestartRegion(RegionInfo whichRegion)
         {
             m_log.InfoFormat(
-                "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", 
+                "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})",
                 whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY);
 
             //ShutdownClientServer(whichRegion);
@@ -746,18 +825,18 @@ namespace OpenSim
 
         /// <summary>
         /// Handler to supply the current extended status of this sim
-        /// Sends the statistical data in a json serialization 
+        /// Sends the statistical data in a json serialization
         /// </summary>
         public class XSimStatusHandler : BaseStreamHandler
         {
             OpenSimBase m_opensim;
-        
-            public XSimStatusHandler(OpenSimBase sim) 
+
+            public XSimStatusHandler(OpenSimBase sim)
                 : base("GET", "/" + Util.SHA1Hash(sim.osSecret), "XSimStatus", "Simulator XStatus")
             {
                 m_opensim = sim;
             }
-            
+
             protected override byte[] ProcessRequest(string path, Stream request,
                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
             {
@@ -772,20 +851,20 @@ namespace OpenSim
 
         /// <summary>
         /// Handler to supply the current extended status of this sim to a user configured URI
-        /// Sends the statistical data in a json serialization 
-        /// If the request contains a key, "callback" the response will be wrappend in the 
+        /// Sends the statistical data in a json serialization
+        /// If the request contains a key, "callback" the response will be wrappend in the
         /// associated value for jsonp used with ajax/javascript
         /// </summary>
         protected class UXSimStatusHandler : BaseStreamHandler
         {
             OpenSimBase m_opensim;
-        
+
             public UXSimStatusHandler(OpenSimBase sim)
                 : base("GET", "/" + sim.userStatsURI, "UXSimStatus", "Simulator UXStatus")
             {
-                m_opensim = sim;                
+                m_opensim = sim;
             }
-            
+
             protected override byte[] ProcessRequest(string path, Stream request,
                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
             {
@@ -798,6 +877,26 @@ namespace OpenSim
             }
         }
 
+        /// <summary>
+        /// handler to supply serving http://domainname:port/robots.txt
+        /// </summary>
+        public class SimRobotsHandler : BaseStreamHandler
+        {
+            public SimRobotsHandler() : base("GET", "/robots.txt", "SimRobots.txt", "Simulator Robots.txt") {}
+
+            protected override byte[] ProcessRequest(string path, Stream request,
+                                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+            {
+                string robots = "# go away\nUser-agent: *\nDisallow: /\n";
+                return Util.UTF8.GetBytes(robots);
+            }
+
+            public override string ContentType
+            {
+                get { return "text/plain"; }
+            }
+        }
+
         #endregion
 
         /// <summary>
@@ -858,7 +957,7 @@ namespace OpenSim
         {
             regionnum = SceneManager.Scenes.Count;
         }
-        
+
         /// <summary>
         /// Create an estate with an initial region.
         /// </summary>
@@ -885,19 +984,19 @@ namespace OpenSim
                 MainConsole.Instance.OutputFormat("An estate named {0} already exists.  Please try again.", newName);
                 return false;
             }
-            
+
             regInfo.EstateSettings.EstateName = newName;
-            
+
             // FIXME: Later on, the scene constructor will reload the estate settings no matter what.
             // Therefore, we need to do an initial save here otherwise the new estate name will be reset
             // back to the default.  The reloading of estate settings by scene could be eliminated if it
-            // knows that the passed in settings in RegionInfo are already valid.  Also, it might be 
+            // knows that the passed in settings in RegionInfo are already valid.  Also, it might be
             // possible to eliminate some additional later saves made by callers of this method.
-            EstateDataService.StoreEstateSettings(regInfo.EstateSettings);   
-            
+            EstateDataService.StoreEstateSettings(regInfo.EstateSettings);
+
             return true;
         }
-        
+
         /// <summary>
         /// Load the estate information for the provided RegionInfo object.
         /// </summary>
@@ -911,8 +1010,8 @@ namespace OpenSim
                 return false;   // estate info in the database did not change
 
             m_log.WarnFormat("[ESTATE] Region {0} is not part of an estate.", regInfo.RegionName);
-            
-            List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();                
+
+            List<EstateSettings> estates = EstateDataService.LoadEstateSettingsAll();
             Dictionary<string, EstateSettings> estatesByName = new Dictionary<string, EstateSettings>();
 
             foreach (EstateSettings estate in estates)
@@ -1005,12 +1104,12 @@ namespace OpenSim
                         MainConsole.Instance.Output("Joining the estate failed. Please try again.");
                     }
                 }
-            }
+            }
 
-            return true;        // need to update the database
-        }
+            return true;        // need to update the database
+        }
     }
-    
+
     public class OpenSimConfigSource
     {
         public IConfigSource Source;
diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
index 26990f7..09772d3 100644
--- a/OpenSim/Region/Application/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Mono.Addins;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim")]
@@ -15,8 +15,8 @@ using Mono.Addins;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -26,11 +26,11 @@ using Mono.Addins;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.3.*")]
+[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
 
 [assembly: AddinRoot("OpenSim", OpenSim.VersionInfo.VersionNumber)]
 [assembly: ImportAddinAssembly("OpenSim.Framework.dll")]
diff --git a/OpenSim/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs
index 08c8579..83a9fff 100644
--- a/OpenSim/Region/Application/RegionApplicationBase.cs
+++ b/OpenSim/Region/Application/RegionApplicationBase.cs
@@ -57,9 +57,9 @@ namespace OpenSim
         public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } }
         public ISimulationDataService SimulationDataService { get { return m_simulationDataService; } }
         public IEstateDataService EstateDataService { get { return m_estateDataService; } }
-       
+
         protected abstract void Initialize();
-        
+
         protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager);
 
         protected override void StartupSpecific()
@@ -68,11 +68,11 @@ namespace OpenSim
 
             Initialize();
 
-            m_httpServer 
+            m_httpServer
                 = new BaseHttpServer(
-                    m_httpServerPort, m_networkServersInfo.HttpUsesSSL, m_networkServersInfo.httpSSLPort, 
+                    m_httpServerPort, m_networkServersInfo.HttpUsesSSL, m_networkServersInfo.httpSSLPort,
                     m_networkServersInfo.HttpSSLCN);
-            
+
             if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort))
             {
                 m_log.Error("[REGION SERVER]: HTTP Server config failed.   HTTP Server and HTTPS server must be on different ports");
@@ -87,17 +87,29 @@ namespace OpenSim
             // "OOB" Server
             if (m_networkServersInfo.ssl_listener)
             {
-                BaseHttpServer server = new BaseHttpServer(
-                    m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
-                    m_networkServersInfo.cert_pass);
+                if (!m_networkServersInfo.ssl_external)
+                {
+                    BaseHttpServer server = new BaseHttpServer(
+                        m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
+                        m_networkServersInfo.cert_pass);
 
-                m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
-                MainServer.AddHttpServer(server);
-                server.Start();
+                    m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
+                    MainServer.AddHttpServer(server);
+                    server.Start();
+                }
+                else
+                {
+                    BaseHttpServer server = new BaseHttpServer(
+                        m_networkServersInfo.https_port);
+
+                    m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0} for external HTTPS", server.Port);
+                    MainServer.AddHttpServer(server);
+                    server.Start();
+                }
             }
-            
+
             base.StartupSpecific();
         }
 
     }
-}
\ No newline at end of file
+}