diff options
*** BIG CHANGES : REGION STORAGE MOVED : UPDATE YOUR OpenSim.ini FROM OpenSim.ini.example **
* Now moved region storage from region to application, so we have one storage per application, instead of one per region.
* Changed so that the region store providers use connectionstrings, not filenames
* Removed various unfit fields and properties (call me Darwin)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index b0e6419..bcd845f 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -55,6 +55,9 @@ namespace OpenSim.Region.ClientStack | |||
55 | protected CommunicationsManager m_commsManager; | 55 | protected CommunicationsManager m_commsManager; |
56 | 56 | ||
57 | protected SceneManager m_sceneManager = new SceneManager(); | 57 | protected SceneManager m_sceneManager = new SceneManager(); |
58 | |||
59 | protected StorageManager m_storageManager; | ||
60 | protected string m_storageConnectionString; | ||
58 | 61 | ||
59 | public SceneManager SceneManager | 62 | public SceneManager SceneManager |
60 | { | 63 | { |
@@ -70,6 +73,8 @@ namespace OpenSim.Region.ClientStack | |||
70 | { | 73 | { |
71 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); | 74 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); |
72 | 75 | ||
76 | m_storageManager = CreateStorageManager(m_storageConnectionString ); | ||
77 | |||
73 | Initialize(); | 78 | Initialize(); |
74 | 79 | ||
75 | m_httpServer = new BaseHttpServer(m_httpServerPort); | 80 | m_httpServer = new BaseHttpServer(m_httpServerPort); |
@@ -88,7 +93,7 @@ namespace OpenSim.Region.ClientStack | |||
88 | 93 | ||
89 | protected abstract LogBase CreateLog(); | 94 | protected abstract LogBase CreateLog(); |
90 | protected abstract PhysicsScene GetPhysicsScene(); | 95 | protected abstract PhysicsScene GetPhysicsScene(); |
91 | protected abstract StorageManager CreateStorageManager(RegionInfo regionInfo); | 96 | protected abstract StorageManager CreateStorageManager(string connectionstring); |
92 | 97 | ||
93 | protected PhysicsScene GetPhysicsScene(string engine, string meshEngine) | 98 | protected PhysicsScene GetPhysicsScene(string engine, string meshEngine) |
94 | { | 99 | { |
@@ -103,8 +108,7 @@ namespace OpenSim.Region.ClientStack | |||
103 | AgentCircuitManager circuitManager = new AgentCircuitManager(); | 108 | AgentCircuitManager circuitManager = new AgentCircuitManager(); |
104 | udpServer = new UDPServer(regionInfo.InternalEndPoint.Port, m_assetCache, m_log, circuitManager); | 109 | udpServer = new UDPServer(regionInfo.InternalEndPoint.Port, m_assetCache, m_log, circuitManager); |
105 | 110 | ||
106 | StorageManager storageManager = CreateStorageManager(regionInfo); | 111 | Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); |
107 | Scene scene = CreateScene(regionInfo, storageManager, circuitManager); | ||
108 | 112 | ||
109 | udpServer.LocalScene = scene; | 113 | udpServer.LocalScene = scene; |
110 | 114 | ||