aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/Application.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
2 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 0e2608a..6faca1b 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -68,7 +68,6 @@ namespace OpenSim
68 configSource.AddSwitch("Startup", "inifile"); 68 configSource.AddSwitch("Startup", "inifile");
69 configSource.AddSwitch("Startup", "gridmode"); 69 configSource.AddSwitch("Startup", "gridmode");
70 configSource.AddSwitch("Startup", "physics"); 70 configSource.AddSwitch("Startup", "physics");
71 configSource.AddSwitch("Startup", "verbose");
72 configSource.AddSwitch("Startup", "useexecutepath"); 71 configSource.AddSwitch("Startup", "useexecutepath");
73 72
74 configSource.AddConfig("StandAlone"); 73 configSource.AddConfig("StandAlone");
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6e89143..bdefd0f 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -78,7 +78,6 @@ namespace OpenSim
78 protected List<UDPServer> m_udpServers = new List<UDPServer>(); 78 protected List<UDPServer> m_udpServers = new List<UDPServer>();
79 protected List<RegionInfo> m_regionData = new List<RegionInfo>(); 79 protected List<RegionInfo> m_regionData = new List<RegionInfo>();
80 80
81 private bool m_verbose;
82 private bool m_physicalPrim; 81 private bool m_physicalPrim;
83 private bool m_permissions = false; 82 private bool m_permissions = false;
84 83
@@ -173,7 +172,6 @@ namespace OpenSim
173 { 172 {
174 config.Set("gridmode", false); 173 config.Set("gridmode", false);
175 config.Set("physics", "basicphysics"); 174 config.Set("physics", "basicphysics");
176 config.Set("verbose", true);
177 config.Set("physical_prim", true); 175 config.Set("physical_prim", true);
178 config.Set("see_into_this_sim_from_neighbor", true); 176 config.Set("see_into_this_sim_from_neighbor", true);
179 config.Set("serverside_object_permissions", false); 177 config.Set("serverside_object_permissions", false);
@@ -241,9 +239,6 @@ namespace OpenSim
241 m_physicsEngine = startupConfig.GetString("physics", "basicphysics"); 239 m_physicsEngine = startupConfig.GetString("physics", "basicphysics");
242 m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher"); 240 m_meshEngineName = startupConfig.GetString("meshing", "ZeroMesher");
243 241
244 // TODO: since log4net changes, verbose flag doesn't do anything
245 m_verbose = startupConfig.GetBoolean("verbose", true);
246
247 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true); 242 m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
248 243
249 m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); 244 m_see_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);