aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMW2008-11-05 18:00:45 +0000
committerMW2008-11-05 18:00:45 +0000
commit204ef95843908a3c5e27ae42b5ffcb0a235a9552 (patch)
tree9e5269aa234ed323dbf0fc31ab54fe038c4a7234 /OpenSim/Region/Application
parentmore startup/initialisation refactoring (diff)
downloadopensim-SC_OLD-204ef95843908a3c5e27ae42b5ffcb0a235a9552.zip
opensim-SC_OLD-204ef95843908a3c5e27ae42b5ffcb0a235a9552.tar.gz
opensim-SC_OLD-204ef95843908a3c5e27ae42b5ffcb0a235a9552.tar.bz2
opensim-SC_OLD-204ef95843908a3c5e27ae42b5ffcb0a235a9552.tar.xz
Moved a couple of more configuration fields to ConfigSettings
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs15
1 files changed, 10 insertions, 5 deletions
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
286 Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); 286 Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
287 Thread.Sleep(3000); 287 Thread.Sleep(3000);
288 } 288 }
289 289
290 m_storageConnectionString = startupConfig.GetString("storage_connection_string"); 290 m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string");
291 m_estateConnectionString = startupConfig.GetString("estate_connection_string", m_storageConnectionString); 291 m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
292 m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); 292 m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
293 m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin"); 293 m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin");
294 } 294 }
@@ -589,9 +589,14 @@ namespace OpenSim
589 Scene target; 589 Scene target;
590 if (m_sceneManager.TryGetScene(name, out target)) 590 if (m_sceneManager.TryGetScene(name, out target))
591 RemoveRegion(target, cleanUp); 591 RemoveRegion(target, cleanUp);
592 } 592 }
593
594 protected override StorageManager CreateStorageManager()
595 {
596 return CreateStorageManager(m_configSettings.StorageConnectionString, m_configSettings.EstateConnectionString);
597 }
593 598
594 protected override StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring) 599 protected StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring)
595 { 600 {
596 return new StorageManager(m_configSettings.StorageDll, connectionstring, estateconnectionstring); 601 return new StorageManager(m_configSettings.StorageDll, connectionstring, estateconnectionstring);
597 } 602 }