aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs9
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index dadaf88..3e941cf 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -62,13 +62,10 @@ namespace OpenSim.Region.ClientStack
62 62
63 protected StorageManager m_storageManager; 63 protected StorageManager m_storageManager;
64 protected string m_storageConnectionString; 64 protected string m_storageConnectionString;
65 protected string m_estateConnectionString;
65 66
66 protected ClientStackManager m_clientStackManager; 67 protected ClientStackManager m_clientStackManager;
67 68
68 // An attribute to indicate whether prim inventories should be persisted.
69 // Probably will be temporary until this stops being experimental.
70 protected bool m_storagePersistPrimInventories;
71
72 public SceneManager SceneManager 69 public SceneManager SceneManager
73 { 70 {
74 get { return m_sceneManager; } 71 get { return m_sceneManager; }
@@ -78,7 +75,7 @@ namespace OpenSim.Region.ClientStack
78 { 75 {
79 base.Startup(); 76 base.Startup();
80 77
81 m_storageManager = CreateStorageManager(m_storageConnectionString); 78 m_storageManager = CreateStorageManager(m_storageConnectionString, m_estateConnectionString);
82 79
83 m_clientStackManager = CreateClientStackManager(); 80 m_clientStackManager = CreateClientStackManager();
84 81
@@ -101,7 +98,7 @@ namespace OpenSim.Region.ClientStack
101 98
102 // protected abstract ConsoleBase CreateConsole(); 99 // protected abstract ConsoleBase CreateConsole();
103 protected abstract PhysicsScene GetPhysicsScene(); 100 protected abstract PhysicsScene GetPhysicsScene();
104 protected abstract StorageManager CreateStorageManager(string connectionstring); 101 protected abstract StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring);
105 protected abstract ClientStackManager CreateClientStackManager(); 102 protected abstract ClientStackManager CreateClientStackManager();
106 103
107 protected PhysicsScene GetPhysicsScene(string engine, string meshEngine, IConfigSource config) 104 protected PhysicsScene GetPhysicsScene(string engine, string meshEngine, IConfigSource config)