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, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 286c5a1..6838ab5 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -736,6 +736,11 @@ namespace OpenSim
         protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
                                              AgentCircuitManager circuitManager)
         {
+            bool hgrid = ConfigSource.Source.Configs["Startup"].GetBoolean("hypergrid", false);
+            if (hgrid)
+                return HGCommands.CreateScene(regionInfo, circuitManager, m_commsManager, 
+                storageManager, m_moduleLoader, m_configSettings, m_config, m_version);
+
             SceneCommunicationService sceneGridService = new SceneCommunicationService(m_commsManager);
 
             return new Scene(