Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.

3 files changed, 2 insertions, 8 deletions

diff --git a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs b/OpenSim/Data/IOfflineIMData.cs
index a507f7d..e780304 100644
--- a/OpenSim/Addons/OfflineIM/Data/IOfflineIMData.cs
+++ b/OpenSim/Data/IOfflineIMData.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
 using OpenSim.Data;
 using OpenMetaverse;
 
-namespace OpenSim.OfflineIM
+namespace OpenSim.Data
 {
     public class OfflineIMData
     {
diff --git a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
index 0a61cd2..252f358 100644
--- a/OpenSim/Addons/OfflineIM/Data/MySQLOfflineIMData.cs
+++ b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
@@ -36,16 +36,10 @@ using OpenSim.Data.MySQL;
 using OpenMetaverse;
 using MySql.Data.MySqlClient;
 
-namespace OpenSim.OfflineIM
+namespace OpenSim.Data.MySQL
 {
     public class MySQLOfflineIMData : MySQLGenericTableHandler<OfflineIMData>, IOfflineIMData
     {
-        protected override Assembly Assembly
-        {
-            // WARNING! Moving migrations to this assembly!!!
-            get { return GetType().Assembly; }
-        }
-
         public MySQLOfflineIMData(string connectionString, string realm)
             : base(connectionString, realm, "IM_Store")
         {
diff --git a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations b/OpenSim/Data/MySQL/Resources/IM_Store.migrations
index 7cfcd43..7cfcd43 100644
--- a/OpenSim/Addons/OfflineIM/Resources/IM_Store.migrations
+++ b/OpenSim/Data/MySQL/Resources/IM_Store.migrations