Getting rid of -hypergrid=true on the command line. This config now goes inside OpenSim.ini in the Startup section. This makes the HG compatible with -background, and prepares the way for further work on HG-related config vars. Might help with mantis #3527.

1 files changed, 1 insertions, 7 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 7244dc9..46e3fc9 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -94,14 +94,12 @@ namespace OpenSim
             configSource.AddSwitch("Startup", "inidirectory");
             configSource.AddSwitch("Startup", "gridmode");
             configSource.AddSwitch("Startup", "physics");
-            configSource.AddSwitch("Startup", "hypergrid");
             configSource.AddSwitch("Startup", "gui");
 
             configSource.AddConfig("StandAlone");
             configSource.AddConfig("Network");
 
             bool background = configSource.Configs["Startup"].GetBoolean("background", false);
-            bool hgrid = configSource.Configs["Startup"].GetBoolean("hypergrid", false);
             m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false);
             m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir);
 
@@ -112,11 +110,7 @@ namespace OpenSim
             }
             else
             {
-                m_sim = null;
-                if (hgrid)
-                    m_sim = new HGOpenSimNode(configSource);
-                else
-                    m_sim = new OpenSim(configSource);
+                m_sim = new OpenSim(configSource);
 
                 m_sim.Startup();