* Apply http://opensimulator.org/mantis/view.php?id=2640

* This is Diva's hypergrid patch, as perviously discussed on the opensim-dev mailing list
* Applied some minor prebuild.xml jiggling to resolve a dependency issue
* Thanks Diva!

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 09d821f..c891549 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -76,11 +76,13 @@ namespace OpenSim
             configSource.AddSwitch("Startup", "gridmode");
             configSource.AddSwitch("Startup", "physics");
             configSource.AddSwitch("Startup", "useexecutepath");
+            configSource.AddSwitch("Startup", "hypergrid");
 
             configSource.AddConfig("StandAlone");
             configSource.AddConfig("Network");
 
             bool background = configSource.Configs["Startup"].GetBoolean("background", false);
+            bool hgrid = configSource.Configs["Startup"].GetBoolean("hypergrid", false);
 
             if (background)
             {
@@ -89,13 +91,19 @@ namespace OpenSim
             }
             else
             {
-                OpenSimBase sim = new OpenSim(configSource);
+                OpenSimBase sim = null;
+                if (hgrid)
+                    sim = new HGOpenSimNode(configSource);
+                else
+                    sim = new OpenSim(configSource);
+
                 sim.Startup();
 
                 while (true)
                 {
                     MainConsole.Instance.Prompt();
                 }
+
             }
         }