From 204ef95843908a3c5e27ae42b5ffcb0a235a9552 Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 5 Nov 2008 18:00:45 +0000 Subject: Moved a couple of more configuration fields to ConfigSettings --- OpenSim/Region/Application/OpenSimBase.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Application/OpenSimBase.cs') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index a3b557d..61e6f09 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -286,9 +286,9 @@ namespace OpenSim Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); Thread.Sleep(3000); } - - m_storageConnectionString = startupConfig.GetString("storage_connection_string"); - m_estateConnectionString = startupConfig.GetString("estate_connection_string", m_storageConnectionString); + + 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.ClientstackDll = startupConfig.GetString("clientstack_plugin"); } @@ -589,9 +589,14 @@ namespace OpenSim Scene target; if (m_sceneManager.TryGetScene(name, out target)) RemoveRegion(target, cleanUp); - } + } + + protected override StorageManager CreateStorageManager() + { + return CreateStorageManager(m_configSettings.StorageConnectionString, m_configSettings.EstateConnectionString); + } - protected override StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring) + protected StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring) { return new StorageManager(m_configSettings.StorageDll, connectionstring, estateconnectionstring); } -- cgit v1.1