aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2010-04-27 00:27:05 +0100
committerMelanie2010-04-27 00:27:05 +0100
commitbbffe16f138a7a11e43cd403df07ed8aa934fab3 (patch)
treed9de049741233cd4fe8c8d6675acc31c483fa845 /OpenSim/Region/Application
parentAdd a parameter to prim inventory update to prevent event firing (diff)
parentAdd a parameter to prim inventory update to prevent event firing (diff)
downloadopensim-SC_OLD-bbffe16f138a7a11e43cd403df07ed8aa934fab3.zip
opensim-SC_OLD-bbffe16f138a7a11e43cd403df07ed8aa934fab3.tar.gz
opensim-SC_OLD-bbffe16f138a7a11e43cd403df07ed8aa934fab3.tar.bz2
opensim-SC_OLD-bbffe16f138a7a11e43cd403df07ed8aa934fab3.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs6
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 4ca6595..cac5fa9 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -349,12 +349,6 @@ namespace OpenSim
349 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true); 349 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
350 350
351 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin"); 351 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
352 if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll")
353 {
354 m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll";
355 m_log.Warn("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
356 Thread.Sleep(3000);
357 }
358 352
359 m_configSettings.StorageConnectionString 353 m_configSettings.StorageConnectionString
360 = startupConfig.GetString("storage_connection_string"); 354 = startupConfig.GetString("storage_connection_string");