diff options
author | Melanie | 2010-03-03 02:07:03 +0000 |
---|---|---|
committer | Melanie | 2010-03-03 02:07:03 +0000 |
commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/Application/ConfigurationLoader.cs | |
parent | Revert "test" (diff) | |
parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
download | opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Region/Application/ConfigurationLoader.cs')
-rw-r--r-- | OpenSim/Region/Application/ConfigurationLoader.cs | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 21edcc5..655c5ca 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs | |||
@@ -304,7 +304,6 @@ namespace OpenSim | |||
304 | 304 | ||
305 | config.Set("region_info_source", "filesystem"); | 305 | config.Set("region_info_source", "filesystem"); |
306 | 306 | ||
307 | config.Set("gridmode", false); | ||
308 | config.Set("physics", "OpenDynamicsEngine"); | 307 | config.Set("physics", "OpenDynamicsEngine"); |
309 | config.Set("meshing", "Meshmerizer"); | 308 | config.Set("meshing", "Meshmerizer"); |
310 | config.Set("physical_prim", true); | 309 | config.Set("physical_prim", true); |
@@ -342,19 +341,7 @@ namespace OpenSim | |||
342 | if (null == config) | 341 | if (null == config) |
343 | config = defaultConfig.AddConfig("Network"); | 342 | config = defaultConfig.AddConfig("Network"); |
344 | 343 | ||
345 | config.Set("default_location_x", 1000); | ||
346 | config.Set("default_location_y", 1000); | ||
347 | config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort); | 344 | config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort); |
348 | config.Set("remoting_listener_port", ConfigSettings.DefaultRegionRemotingPort); | ||
349 | config.Set("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); | ||
350 | config.Set("grid_send_key", "null"); | ||
351 | config.Set("grid_recv_key", "null"); | ||
352 | config.Set("user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); | ||
353 | config.Set("user_send_key", "null"); | ||
354 | config.Set("user_recv_key", "null"); | ||
355 | config.Set("asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()); | ||
356 | config.Set("inventory_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort.ToString()); | ||
357 | config.Set("secure_inventory_server", "true"); | ||
358 | } | 345 | } |
359 | 346 | ||
360 | return defaultConfig; | 347 | return defaultConfig; |
@@ -368,7 +355,6 @@ namespace OpenSim | |||
368 | IConfig startupConfig = m_config.Source.Configs["Startup"]; | 355 | IConfig startupConfig = m_config.Source.Configs["Startup"]; |
369 | if (startupConfig != null) | 356 | if (startupConfig != null) |
370 | { | 357 | { |
371 | m_configSettings.Standalone = !startupConfig.GetBoolean("gridmode", false); | ||
372 | m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); | 358 | m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); |
373 | m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); | 359 | m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); |
374 | m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true); | 360 | m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true); |