aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorDiva Canto2010-01-31 13:01:23 -0800
committerDiva Canto2010-01-31 13:01:23 -0800
commit041594ed075049f804fc157700a6d78e54194c0b (patch)
treeed89689bfdc1948b184438ee4c7329e0296660b4 /OpenSim/Region/Application
parent* Bug fix in XInventoryData -- groupOwned is an int in the DB (diff)
downloadopensim-SC_OLD-041594ed075049f804fc157700a6d78e54194c0b.zip
opensim-SC_OLD-041594ed075049f804fc157700a6d78e54194c0b.tar.gz
opensim-SC_OLD-041594ed075049f804fc157700a6d78e54194c0b.tar.bz2
opensim-SC_OLD-041594ed075049f804fc157700a6d78e54194c0b.tar.xz
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs1
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs14
-rw-r--r--OpenSim/Region/Application/OpenSim.cs13
3 files changed, 1 insertions, 27 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 555baa4..7721cdf 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -129,7 +129,6 @@ namespace OpenSim
129 configSource.AddSwitch("Startup", "inifile"); 129 configSource.AddSwitch("Startup", "inifile");
130 configSource.AddSwitch("Startup", "inimaster"); 130 configSource.AddSwitch("Startup", "inimaster");
131 configSource.AddSwitch("Startup", "inidirectory"); 131 configSource.AddSwitch("Startup", "inidirectory");
132 configSource.AddSwitch("Startup", "gridmode");
133 configSource.AddSwitch("Startup", "physics"); 132 configSource.AddSwitch("Startup", "physics");
134 configSource.AddSwitch("Startup", "gui"); 133 configSource.AddSwitch("Startup", "gui");
135 configSource.AddSwitch("Startup", "console"); 134 configSource.AddSwitch("Startup", "console");
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);
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 299f519..10ff57d 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -122,8 +122,7 @@ namespace OpenSim
122 m_log.Info("===================================================================="); 122 m_log.Info("====================================================================");
123 m_log.Info("========================= STARTING OPENSIM ========================="); 123 m_log.Info("========================= STARTING OPENSIM =========================");
124 m_log.Info("===================================================================="); 124 m_log.Info("====================================================================");
125 m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", 125 m_log.InfoFormat("[OPENSIM MAIN]: Running ");
126 (ConfigurationSettings.Standalone ? "sandbox" : "grid"));
127 //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString()); 126 //m_log.InfoFormat("[OPENSIM MAIN]: GC Is Server GC: {0}", GCSettings.IsServerGC.ToString());
128 // http://msdn.microsoft.com/en-us/library/bb384202.aspx 127 // http://msdn.microsoft.com/en-us/library/bb384202.aspx
129 //GCSettings.LatencyMode = GCLatencyMode.Batch; 128 //GCSettings.LatencyMode = GCLatencyMode.Batch;
@@ -353,16 +352,6 @@ namespace OpenSim
353 "kill uuid <UUID>", 352 "kill uuid <UUID>",
354 "Kill an object by UUID", KillUUID); 353 "Kill an object by UUID", KillUUID);
355 354
356
357 m_console.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
358 "Set local coordinate to map HG regions to", RunCommand);
359 m_console.Commands.AddCommand("hypergrid", false, "link-region",
360 "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
361 "Link a hypergrid region", RunCommand);
362 m_console.Commands.AddCommand("hypergrid", false, "unlink-region",
363 "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
364 "Unlink a hypergrid region", RunCommand);
365
366 } 355 }
367 356
368 public override void ShutdownSpecific() 357 public override void ShutdownSpecific()