5 files changed, 13 insertions, 96 deletions

diff --git a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
index 86434e8..16581f6 100644
--- a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
@@ -88,15 +88,3 @@ CREATE TABLE IF NOT EXISTS userdata (
 
 commit;
 
-
-:VERSION 3         # -------------------------------
- 
-begin;
-CREATE TABLE IF NOT EXISTS usersettings (
-  useruuid char(36) NOT NULL,
-  imviaemail binary(1) NOT NULL,
-  visible binary(1) NOT NULL,
-  email varchar(254) NOT NULL,
-  PRIMARY KEY (useruuid)
-)
-commit;
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index c32982e..82320ca 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Data.SQLite
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public void StoreAsset(AssetBase asset)
+        override public bool StoreAsset(AssetBase asset)
         {
             string assetName = asset.Name;
             if (asset.Name.Length > 64)
@@ -171,6 +171,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
@@ -191,6 +192,7 @@ namespace OpenSim.Data.SQLite
                         cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
 
                         cmd.ExecuteNonQuery();
+                        return true;
                     }
                 }
             }
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index d938b6b..4d6a80a 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -2981,6 +2981,11 @@ namespace OpenSim.Data.SQLite
             }
         }
 
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
+
         public void SaveExtra(UUID regionID, string name, string value)
         {
         }
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
index f98d376..91d62ce 100644
--- a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs
@@ -82,5 +82,10 @@ namespace OpenSim.Data.SQLite
                 return DoQuery(cmd);
             }
         }
+
+        public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
+        {
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 916a226..8c1bcd4 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -747,89 +747,6 @@ namespace OpenSim.Data.SQLite
             }
             return true;
         }
-
-        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
-        {           
-            string query = string.Empty;
-            
-            query += "UPDATE usersettings SET ";
-            query += "imviaemail=:ImViaEmail, ";
-            query += "visible=:Visible ";
-            query += "WHERE useruuid=:uuid";
-            
-            try
-            {
-                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-                {
-                    cmd.CommandText = query;
-                    cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail);
-                    cmd.Parameters.AddWithValue(":Visible", pref.Visible);
-                    cmd.Parameters.AddWithValue(":uuid", pref.UserId.ToString());
-                        
-                    cmd.ExecuteNonQuery();
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                  ": AgentInterestsUpdate exception {0}", e.Message);
-                result = e.Message;
-                return false;
-            }
-            return true;
-        }
-
-        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
-        {
-            IDataReader reader = null;
-            string query = string.Empty;
-            
-            query += "SELECT imviaemail,visible,email FROM ";
-            query += "usersettings WHERE ";
-            query += "useruuid = :Id";
-            
-            OSDArray data = new OSDArray();
-            
-            try
-            {
-                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
-                {
-                    cmd.CommandText = query;
-                    cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
-                        
-                    using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
-                    {
-                        if(reader.Read())
-                        {
-                            bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
-                            bool.TryParse((string)reader["visible"], out pref.Visible);
-                            pref.EMail = (string)reader["email"];
-                         }
-                         else
-                         {
-                            query = "INSERT INTO usersettings VALUES ";
-                            query += "(:Id,'false','false', '')";
-                            
-                            using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
-                            {
-                                put.Parameters.AddWithValue(":Id", pref.UserId.ToString());
-                                put.ExecuteNonQuery();
-                                    
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.DebugFormat("[PROFILES_DATA]" +
-                                  ": Get preferences exception {0}", e.Message);
-                result = e.Message;
-                return false;
-            }
-            return true;
-        }
-
         public bool GetUserAppData(ref UserAppData props, ref string result)
         {
             IDataReader reader = null;