OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved a couple of more configuration fields to ConfigSettings

0.6.0-stable
MW 2008-11-05 18:00:45 +00:00
parent 079469b3f5
commit 204ef95843
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Framework/ConfigSettings.cs
View File

@ -132,5 +132,21 @@ namespace OpenSim.Framework
get { return m_assetStorage; } get { return m_assetStorage; }
set { m_assetStorage = value; } set { m_assetStorage = value; }
} }
protected string m_storageConnectionString;
public string StorageConnectionString
{
get { return m_storageConnectionString; }
set { m_storageConnectionString = value; }
}
protected string m_estateConnectionString;
public string EstateConnectionString
{
get { return m_estateConnectionString; }
set { m_estateConnectionString = value; }
}
} }
} }

15
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -286,9 +286,9 @@ namespace OpenSim
Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll."); Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
Thread.Sleep(3000); Thread.Sleep(3000);
} }
m_storageConnectionString = startupConfig.GetString("storage_connection_string"); m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string");
m_estateConnectionString = startupConfig.GetString("estate_connection_string", m_storageConnectionString); m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin"); m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin");
} }
@ -589,9 +589,14 @@ namespace OpenSim
Scene target; Scene target;
if (m_sceneManager.TryGetScene(name, out target)) if (m_sceneManager.TryGetScene(name, out target))
RemoveRegion(target, cleanUp); RemoveRegion(target, cleanUp);
} }
protected override StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring) protected override StorageManager CreateStorageManager()
{
return CreateStorageManager(m_configSettings.StorageConnectionString, m_configSettings.EstateConnectionString);
}
protected StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring)
{ {
return new StorageManager(m_configSettings.StorageDll, connectionstring, estateconnectionstring); return new StorageManager(m_configSettings.StorageDll, connectionstring, estateconnectionstring);
} }

8
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -61,9 +61,7 @@ namespace OpenSim.Region.ClientStack
protected SceneManager m_sceneManager = new SceneManager(); protected SceneManager m_sceneManager = new SceneManager();
protected StorageManager m_storageManager; protected StorageManager m_storageManager;
protected string m_storageConnectionString;
protected string m_estateConnectionString;
protected ClientStackManager m_clientStackManager; protected ClientStackManager m_clientStackManager;
public SceneManager SceneManager public SceneManager SceneManager
@ -73,14 +71,14 @@ namespace OpenSim.Region.ClientStack
protected abstract void Initialize(); protected abstract void Initialize();
protected abstract PhysicsScene GetPhysicsScene(); protected abstract PhysicsScene GetPhysicsScene();
protected abstract StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring); protected abstract StorageManager CreateStorageManager();
protected abstract ClientStackManager CreateClientStackManager(); protected abstract ClientStackManager CreateClientStackManager();
protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
AgentCircuitManager circuitManager); AgentCircuitManager circuitManager);
protected override void StartupSpecific() protected override void StartupSpecific()
{ {
m_storageManager = CreateStorageManager(m_storageConnectionString, m_estateConnectionString); m_storageManager = CreateStorageManager();
m_clientStackManager = CreateClientStackManager(); m_clientStackManager = CreateClientStackManager();