aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-11 18:02:22 +0000
committerJustin Clarke Casey2009-03-11 18:02:22 +0000
commitacad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch)
tree2379c1ae60c22a4dcee162c5b56d21f367c05bfd /OpenSim/Region/Application
parent* Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff)
downloadopensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.zip
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.gz
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.bz2
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.xz
* Make all coded defaults match settings in OpenSim.ini.example
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs19
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 7c335a7..8aa8dde 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -231,14 +231,14 @@ namespace OpenSim
231 if (null == config) 231 if (null == config)
232 config = defaultConfig.AddConfig("StandAlone"); 232 config = defaultConfig.AddConfig("StandAlone");
233 233
234 config.Set("accounts_authenticate", false); 234 config.Set("accounts_authenticate", true);
235 config.Set("welcome_message", "Welcome to OpenSimulator"); 235 config.Set("welcome_message", "Welcome to OpenSimulator");
236 config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll"); 236 config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
237 config.Set("inventory_source", ""); 237 config.Set("inventory_source", "");
238 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); 238 config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
239 config.Set("user_source", ""); 239 config.Set("user_source", "");
240 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll"); 240 config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
241 config.Set("asset_source", ""); 241 config.Set("asset_source", "URI=file:Asset.db,version=3");
242 config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar)); 242 config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
243 config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar)); 243 config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar));
244 config.Set("dump_assets_to_file", false); 244 config.Set("dump_assets_to_file", false);
@@ -288,11 +288,16 @@ namespace OpenSim
288 Thread.Sleep(3000); 288 Thread.Sleep(3000);
289 } 289 }
290 290
291 m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string"); 291 m_configSettings.StorageConnectionString
292 m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); 292 = startupConfig.GetString("storage_connection_string");
293 m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); 293 m_configSettings.EstateConnectionString
294 m_configSettings.AssetCache = startupConfig.GetString("AssetCache"); 294 = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
295 m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 295 m_configSettings.AssetStorage
296 = startupConfig.GetString("asset_database");
297 m_configSettings.AssetCache
298 = startupConfig.GetString("AssetCache", "OpenSim.Framework.Communications.Cache.AssetCache");
299 m_configSettings.ClientstackDll
300 = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
296 } 301 }
297 302
298 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"]; 303 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];