aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMW2008-11-05 18:00:45 +0000
committerMW2008-11-05 18:00:45 +0000
commit204ef95843908a3c5e27ae42b5ffcb0a235a9552 (patch)
tree9e5269aa234ed323dbf0fc31ab54fe038c4a7234 /OpenSim/Region/ClientStack
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/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs8
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index b671fc5..cac4591 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -61,9 +61,7 @@ namespace OpenSim.Region.ClientStack
61 protected SceneManager m_sceneManager = new SceneManager(); 61 protected SceneManager m_sceneManager = new SceneManager();
62 62
63 protected StorageManager m_storageManager; 63 protected StorageManager m_storageManager;
64 protected string m_storageConnectionString; 64
65 protected string m_estateConnectionString;
66
67 protected ClientStackManager m_clientStackManager; 65 protected ClientStackManager m_clientStackManager;
68 66
69 public SceneManager SceneManager 67 public SceneManager SceneManager
@@ -73,14 +71,14 @@ namespace OpenSim.Region.ClientStack
73 71
74 protected abstract void Initialize(); 72 protected abstract void Initialize();
75 protected abstract PhysicsScene GetPhysicsScene(); 73 protected abstract PhysicsScene GetPhysicsScene();
76 protected abstract StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring); 74 protected abstract StorageManager CreateStorageManager();
77 protected abstract ClientStackManager CreateClientStackManager(); 75 protected abstract ClientStackManager CreateClientStackManager();
78 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, 76 protected abstract Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
79 AgentCircuitManager circuitManager); 77 AgentCircuitManager circuitManager);
80 78
81 protected override void StartupSpecific() 79 protected override void StartupSpecific()
82 { 80 {
83 m_storageManager = CreateStorageManager(m_storageConnectionString, m_estateConnectionString); 81 m_storageManager = CreateStorageManager();
84 82
85 m_clientStackManager = CreateClientStackManager(); 83 m_clientStackManager = CreateClientStackManager();
86 84