Merge branch 'master' into careminster-presence-refactor

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
                 m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
 
                 m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
-                if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll")
-                {
-                    m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll";
-                    m_log.Warn("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
-                    Thread.Sleep(3000);
-                }
 
                 m_configSettings.StorageConnectionString 
                     = startupConfig.GetString("storage_connection_string");