aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 910ec55..05e4f46 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -300,9 +300,8 @@ namespace OpenSim
300 } 300 }
301 m_storageConnectionString 301 m_storageConnectionString
302 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3"); 302 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3");
303 m_storagePersistPrimInventories 303 m_estateConnectionString
304 = startupConfig.GetBoolean("storage_prim_inventories", true); 304 = startupConfig.GetString("estate_connection_string", m_storageConnectionString);
305
306 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); 305 m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
307 m_assetStorage = startupConfig.GetString("asset_database", "local"); 306 m_assetStorage = startupConfig.GetString("asset_database", "local");
308 m_clientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); 307 m_clientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
@@ -555,9 +554,9 @@ namespace OpenSim
555 return clientServer; 554 return clientServer;
556 } 555 }
557 556
558 protected override StorageManager CreateStorageManager(string connectionstring) 557 protected override StorageManager CreateStorageManager(string connectionstring, string estateconnectionstring)
559 { 558 {
560 return new StorageManager(m_storageDll, connectionstring, m_storagePersistPrimInventories); 559 return new StorageManager(m_storageDll, connectionstring, estateconnectionstring);
561 } 560 }
562 561
563 protected override ClientStackManager CreateClientStackManager() 562 protected override ClientStackManager CreateClientStackManager()