aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/Application.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/Application.cs')
-rw-r--r--OpenSim/Region/Application/Application.cs10
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
76 configSource.AddSwitch("Startup", "gridmode"); 76 configSource.AddSwitch("Startup", "gridmode");
77 configSource.AddSwitch("Startup", "physics"); 77 configSource.AddSwitch("Startup", "physics");
78 configSource.AddSwitch("Startup", "useexecutepath"); 78 configSource.AddSwitch("Startup", "useexecutepath");
79 configSource.AddSwitch("Startup", "hypergrid");
79 80
80 configSource.AddConfig("StandAlone"); 81 configSource.AddConfig("StandAlone");
81 configSource.AddConfig("Network"); 82 configSource.AddConfig("Network");
82 83
83 bool background = configSource.Configs["Startup"].GetBoolean("background", false); 84 bool background = configSource.Configs["Startup"].GetBoolean("background", false);
85 bool hgrid = configSource.Configs["Startup"].GetBoolean("hypergrid", false);
84 86
85 if (background) 87 if (background)
86 { 88 {
@@ -89,13 +91,19 @@ namespace OpenSim
89 } 91 }
90 else 92 else
91 { 93 {
92 OpenSimBase sim = new OpenSim(configSource); 94 OpenSimBase sim = null;
95 if (hgrid)
96 sim = new HGOpenSimNode(configSource);
97 else
98 sim = new OpenSim(configSource);
99
93 sim.Startup(); 100 sim.Startup();
94 101
95 while (true) 102 while (true)
96 { 103 {
97 MainConsole.Instance.Prompt(); 104 MainConsole.Instance.Prompt();
98 } 105 }
106
99 } 107 }
100 } 108 }
101 109