diff options
Diffstat (limited to 'OpenSim/Region/Application/Application.cs')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 8 |
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 | |||
94 | configSource.AddSwitch("Startup", "inidirectory"); | 94 | configSource.AddSwitch("Startup", "inidirectory"); |
95 | configSource.AddSwitch("Startup", "gridmode"); | 95 | configSource.AddSwitch("Startup", "gridmode"); |
96 | configSource.AddSwitch("Startup", "physics"); | 96 | configSource.AddSwitch("Startup", "physics"); |
97 | configSource.AddSwitch("Startup", "hypergrid"); | ||
98 | configSource.AddSwitch("Startup", "gui"); | 97 | configSource.AddSwitch("Startup", "gui"); |
99 | 98 | ||
100 | configSource.AddConfig("StandAlone"); | 99 | configSource.AddConfig("StandAlone"); |
101 | configSource.AddConfig("Network"); | 100 | configSource.AddConfig("Network"); |
102 | 101 | ||
103 | bool background = configSource.Configs["Startup"].GetBoolean("background", false); | 102 | bool background = configSource.Configs["Startup"].GetBoolean("background", false); |
104 | bool hgrid = configSource.Configs["Startup"].GetBoolean("hypergrid", false); | ||
105 | m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false); | 103 | m_saveCrashDumps = configSource.Configs["Startup"].GetBoolean("save_crashes", false); |
106 | m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); | 104 | m_crashDir = configSource.Configs["Startup"].GetString("crash_dir", m_crashDir); |
107 | 105 | ||
@@ -112,11 +110,7 @@ namespace OpenSim | |||
112 | } | 110 | } |
113 | else | 111 | else |
114 | { | 112 | { |
115 | m_sim = null; | 113 | m_sim = new OpenSim(configSource); |
116 | if (hgrid) | ||
117 | m_sim = new HGOpenSimNode(configSource); | ||
118 | else | ||
119 | m_sim = new OpenSim(configSource); | ||
120 | 114 | ||
121 | m_sim.Startup(); | 115 | m_sim.Startup(); |
122 | 116 | ||