Merge branch 'master' into careminster-presence-refactor

2 files changed, 3 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");
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
index 8eb906c..e25a6e8 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs
@@ -30,6 +30,9 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Interfaces
 {
+    /// <summary>
+    /// DEPRECATED! Use INonSharedRegionModule or ISharedRegionModule instead
+    /// </summary>
     public interface IRegionModule
     {
         void Initialise(Scene scene, IConfigSource source);