aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoralondria2008-01-12 17:10:06 +0000
committeralondria2008-01-12 17:10:06 +0000
commit4e643eba5ff4188a22e46173a179e0faf04c1237 (patch)
tree5058169cde90a0b63cad535a3ff228e678ddf972
parentSet eol (diff)
downloadopensim-SC-4e643eba5ff4188a22e46173a179e0faf04c1237.zip
opensim-SC-4e643eba5ff4188a22e46173a179e0faf04c1237.tar.gz
opensim-SC-4e643eba5ff4188a22e46173a179e0faf04c1237.tar.bz2
opensim-SC-4e643eba5ff4188a22e46173a179e0faf04c1237.tar.xz
If OpenSim.ini uses OpenSim.DataStore.MonoSqlite.dll, have it use OpenSim.Framework.Data.SQLite.dll during runtime.
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 730e53a..1f0dd28 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -240,7 +240,11 @@ namespace OpenSim
240 240
241 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false); 241 m_permissions = startupConfig.GetBoolean("serverside_object_permissions", false);
242 242
243 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.DataStore.MonoSqlite.dll"); 243 m_storageDll = startupConfig.GetString("storage_plugin", "OpenSim.Framework.Data.SQLite.dll");
244 if (m_storageDll == "OpenSim.DataStore.MonoSqlite.dll")
245 {
246 m_storageDll = "OpenSim.Framework.Data.SQLite.dll";
247 }
244 m_storageConnectionString 248 m_storageConnectionString
245 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3"); 249 = startupConfig.GetString("storage_connection_string", "URI=file:OpenSim.db,version=3");
246 m_storagePersistPrimInventories 250 m_storagePersistPrimInventories