From acad0328b2c50d22fe76ebb7c8de2c97c856b42f Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 11 Mar 2009 18:02:22 +0000 Subject: * 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) --- OpenSim/Region/Application/ConfigurationLoader.cs | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Application') 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 if (null == config) config = defaultConfig.AddConfig("StandAlone"); - config.Set("accounts_authenticate", false); + config.Set("accounts_authenticate", true); config.Set("welcome_message", "Welcome to OpenSimulator"); config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll"); config.Set("inventory_source", ""); config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll"); config.Set("user_source", ""); config.Set("asset_plugin", "OpenSim.Data.SQLite.dll"); - config.Set("asset_source", ""); + config.Set("asset_source", "URI=file:Asset.db,version=3"); config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar)); config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar)); config.Set("dump_assets_to_file", false); @@ -288,11 +288,16 @@ namespace OpenSim Thread.Sleep(3000); } - m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string"); - m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); - m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); - m_configSettings.AssetCache = startupConfig.GetString("AssetCache"); - m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); + m_configSettings.StorageConnectionString + = startupConfig.GetString("storage_connection_string"); + m_configSettings.EstateConnectionString + = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); + m_configSettings.AssetStorage + = startupConfig.GetString("asset_database"); + m_configSettings.AssetCache + = startupConfig.GetString("AssetCache", "OpenSim.Framework.Communications.Cache.AssetCache"); + m_configSettings.ClientstackDll + = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); } IConfig standaloneConfig = m_config.Source.Configs["StandAlone"]; -- cgit v1.1