aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index fdaaa51..8047b1b 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -110,10 +110,6 @@ namespace OpenSim
110 if (File.Exists(iniFilePath)) 110 if (File.Exists(iniFilePath))
111 { 111 {
112 m_config = new IniConfigSource(iniFilePath); 112 m_config = new IniConfigSource(iniFilePath);
113
114 //enable following line, if we want the original config source(normally commandline args) merged with ini file settings.
115 //in this case we have it so that if both sources have the same named setting, the command line value will overwrite the ini file value.
116 //(as if someone has bothered to enter a command line arg, we should take notice of it)
117 m_config.Merge(configSource); 113 m_config.Merge(configSource);
118 } 114 }
119 else 115 else
@@ -145,12 +141,6 @@ namespace OpenSim
145 m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine"); 141 m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine");
146 142
147 m_assetStorage = startupConfig.GetString("asset_database", "db4o"); 143 m_assetStorage = startupConfig.GetString("asset_database", "db4o");
148
149 // wtf?
150 startupConfig.GetBoolean("default_modules", true);
151 startupConfig.GetBoolean("default_shared_modules", true);
152 startupConfig.GetString("except_modules", "");
153 startupConfig.GetString("except_shared_modules", "");
154 } 144 }
155 145
156 IConfig standaloneConfig = m_config.Configs["StandAlone"]; 146 IConfig standaloneConfig = m_config.Configs["StandAlone"];