aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorDahlia Trimble2009-03-11 09:31:02 +0000
committerDahlia Trimble2009-03-11 09:31:02 +0000
commit669aa46bff3bf0ced71658b8782635ac4aef73e9 (patch)
tree246adeff8c4ba2f6afdd063286f788578e0fe611 /OpenSim/Region/Application
parentFrom: Alan M Webb <alan_webb@us.ibm.com> (diff)
downloadopensim-SC-669aa46bff3bf0ced71658b8782635ac4aef73e9.zip
opensim-SC-669aa46bff3bf0ced71658b8782635ac4aef73e9.tar.gz
opensim-SC-669aa46bff3bf0ced71658b8782635ac4aef73e9.tar.bz2
opensim-SC-669aa46bff3bf0ced71658b8782635ac4aef73e9.tar.xz
update some ini defaults in code - all defaults from beginning of OpenSim.ini.example thru DefaultScriptEngine = "XEngine"
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs2
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 6a103bd..7c335a7 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -292,7 +292,7 @@ namespace OpenSim
292 m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); 292 m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
293 m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); 293 m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
294 m_configSettings.AssetCache = startupConfig.GetString("AssetCache"); 294 m_configSettings.AssetCache = startupConfig.GetString("AssetCache");
295 m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin"); 295 m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
296 } 296 }
297 297
298 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"]; 298 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 69dfac5..d8a9b4c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -68,8 +68,8 @@ namespace OpenSim
68 68
69 if (startupConfig != null) 69 if (startupConfig != null)
70 { 70 {
71 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); 71 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt");
72 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); 72 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "shutdown_commands.txt");
73 73
74 m_gui = startupConfig.GetBoolean("gui", false); 74 m_gui = startupConfig.GetBoolean("gui", false);
75 75