7 files changed, 36 insertions, 148 deletions

diff --git a/OpenSim/Data/IProfilesData.cs b/OpenSim/Data/IProfilesData.cs
index 7fb075d..0de7f68 100644
--- a/OpenSim/Data/IProfilesData.cs
+++ b/OpenSim/Data/IProfilesData.cs
@@ -48,8 +48,6 @@ namespace OpenSim.Data
         bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result);
         bool UpdateAvatarInterests(UserProfileProperties up, ref string result);
         bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result);
-        bool UpdateUserPreferences(ref UserPreferences pref,  ref string result);
-        bool GetUserPreferences(ref UserPreferences pref, ref string result);
         bool GetUserAppData(ref UserAppData props, ref string result);
         bool SetUserAppData(UserAppData props, ref string result);
         OSDArray GetUserImageAssets(UUID avatarId);
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 63492c2..dc88f94 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -895,7 +895,7 @@ namespace OpenSim.Data.MySQL
         }
         
         #region User Preferences
-        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
+        public OSDArray GetUserPreferences(UUID avatarId)
         {
             string query = string.Empty;
             
@@ -912,16 +912,19 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?Id", pref.UserId.ToString());
+                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
                         
                         using (MySqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.HasRows)
                             {
                                 reader.Read();
-                                bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
-                                bool.TryParse((string)reader["visible"], out pref.Visible);
-                                pref.EMail = (string)reader["email"];
+                                OSDMap record = new OSDMap();
+                                
+                                record.Add("imviaemail",OSD.FromString((string)reader["imviaemail"]));
+                                record.Add("visible",OSD.FromString((string)reader["visible"]));
+                                record.Add("email",OSD.FromString((string)reader["email"]));
+                                data.Add(record);
                             }
                             else
                             {
@@ -944,19 +947,17 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": Get preferences exception {0}", e.Message);
-                result = e.Message;
-                return false;
             }
-            return true;
+            return data;
         }
         
-        public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
+        public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
         {           
             string query = string.Empty;
-
-            query += "UPDATE usersettings SET ";
+            
+            query += "UPDATE userpsettings SET ";
             query += "imviaemail=?ImViaEmail, ";
-            query += "visible=?Visible ";
+            query += "visible=?Visible,";
             query += "WHERE useruuid=?uuid";
             
             try
@@ -966,11 +967,14 @@ namespace OpenSim.Data.MySQL
                     dbcon.Open();
                     using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail);
-                        cmd.Parameters.AddWithValue("?Visible", pref.Visible);
-                        cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
-
-                        cmd.ExecuteNonQuery();
+                        cmd.Parameters.AddWithValue("?ImViaEmail", emailIm.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("?WantText", visible.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("?uuid", avatarId.ToString());
+                        
+                        lock(Lock)
+                        {
+                            cmd.ExecuteNonQuery();
+                        }
                     }
                 }
             }
@@ -978,7 +982,6 @@ namespace OpenSim.Data.MySQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": AgentInterestsUpdate exception {0}", e.Message);
-                result = e.Message;
                 return false;
             }
             return true;
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index bd325da..c29f1ab 100644
--- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -81,13 +81,3 @@ CREATE TABLE IF NOT EXISTS `userdata` (
 
 commit;
 
-:VERSION 3         # -------------------------------
-begin;
-CREATE TABLE IF NOT EXISTS `usersettings` (
-  `useruuid` varchar(36) NOT NULL,
-  `imviaemail` enum('true','false') NOT NULL,
-  `visible` enum('true','false') NOT NULL,
-  `email` varchar(254) NOT NULL,
-  PRIMARY KEY (`useruuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-commit;
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index 46f57d8..f4e41b4 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -874,7 +874,7 @@ namespace OpenSim.Data.PGSQL
         }
         
         #region User Preferences
-        public bool GetUserPreferences(ref UserPreferences pref, ref string result)
+        public OSDArray GetUserPreferences(UUID avatarId)
         {
             string query = string.Empty;
             
@@ -891,16 +891,19 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("Id", pref.UserId.ToString());
+                        cmd.Parameters.AddWithValue("Id", avatarId.ToString());
                         
                         using (NpgsqlDataReader reader = cmd.ExecuteReader())
                         {
                             if(reader.HasRows)
                             {
                                 reader.Read();
-                                bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
-                                bool.TryParse((string)reader["visible"], out pref.Visible);
-                                pref.EMail = (string)reader["email"];
+                                OSDMap record = new OSDMap();
+                                
+                                record.Add("imviaemail",OSD.FromString((string)reader["imviaemail"]));
+                                record.Add("visible",OSD.FromString((string)reader["visible"]));
+                                record.Add("email",OSD.FromString((string)reader["email"]));
+                                data.Add(record);
                             }
                             else
                             {
@@ -923,16 +926,15 @@ namespace OpenSim.Data.PGSQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": Get preferences exception {0}", e.Message);
-                result = e.Message;
             }
-            return true;
+            return data;
         }
-
-        public bool UpdateUserPreferences(ref UserPreferences pref,  ref string result)
+        
+        public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
         {           
             string query = string.Empty;
             
-            query += "UPDATE usersettings SET ";
+            query += "UPDATE userpsettings SET ";
             query += "imviaemail=:ImViaEmail, ";
             query += "visible=:Visible,";
             query += "WHERE useruuid=:uuid";
@@ -944,9 +946,9 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.AddWithValue("ImViaEmail", pref.IMViaEmail.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("Visible", pref.Visible.ToString().ToLower ());
-                        cmd.Parameters.AddWithValue("uuid", pref.UserId.ToString());
+                        cmd.Parameters.AddWithValue("ImViaEmail", emailIm.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("WantText", visible.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("uuid", avatarId.ToString());
                         
                         lock(Lock)
                         {
@@ -959,7 +961,6 @@ namespace OpenSim.Data.PGSQL
             {
                 m_log.DebugFormat("[PROFILES_DATA]" +
                                  ": AgentInterestsUpdate exception {0}", e.Message);
-                result = e.Message;
                 return false;
             }
             return true;
diff --git a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
index 4fcaa8e..f23c870 100644
--- a/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/PGSQL/Resources/UserProfiles.migrations
@@ -81,12 +81,3 @@ CREATE TABLE userdata (
 
 commit;
 
-:VERSION 3        # -------------------------------
-begin;
-CREATE TABLE usersettings (
-    "useruuid" char(36) NOT NULL,
-    "imviaemail" bytea NOT NULL,
-    "visible" bytea NOT NULL,
-    PRIMARY KEY ("useruuid")
-);
-commit;
\ No newline at end of file
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/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;