Merge branch 'master' of /team/src/opensim

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 0dd9e2f..1f616fe 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -915,7 +915,7 @@ namespace OpenSim.Data.MySQL
                                 reader.Read();
                                 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
                                 bool.TryParse((string)reader["visible"], out pref.Visible);
-                                                                pref.EMail = (string)reader["email"];
+                                pref.EMail = (string)reader["email"];
                             }
                             else
                             {
@@ -955,7 +955,7 @@ namespace OpenSim.Data.MySQL
             query += "UPDATE usersettings SET ";
             query += "imviaemail=?ImViaEmail, ";
             query += "visible=?Visible, ";
-                        query += "email=?EMail ";
+            query += "email=?EMail ";
             query += "WHERE useruuid=?uuid";
             
             try
@@ -967,8 +967,8 @@ namespace OpenSim.Data.MySQL
                     {
                         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("?EMail", pref.EMail.ToString().ToLower());
+                        cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
+                        cmd.Parameters.AddWithValue("?EMail", pref.EMail.ToString().ToLower());
 
                         cmd.ExecuteNonQuery();
                     }
@@ -977,7 +977,7 @@ namespace OpenSim.Data.MySQL
             catch (Exception e)
             {
                 m_log.ErrorFormat("[PROFILES_DATA]" +
-                                        ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
+                    ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
                 result = e.Message;
                 return false;
             }