1 files changed, 21 insertions, 18 deletions

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;