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

kidaa · Nov 26, 2014 · 62b778c · 62b778c
2 parents 86367d7 + a76aec8
commit 62b778c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -915,7 +915,7 @@ public bool GetUserPreferences(ref UserPreferences pref, ref string result)
                                 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 @@ public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
             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 @@ public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
                     {
                         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 @@ public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
             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;
             }

diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -901,7 +901,7 @@ public bool GetUserPreferences(ref UserPreferences pref, ref string result)
                                 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
                             {
@@ -936,7 +936,7 @@ public bool UpdateUserPreferences(ref UserPreferences pref,  ref string result)
             query += "UPDATE usersettings SET ";
             query += "imviaemail=:ImViaEmail, ";
             query += "visible=:Visible, ";
-			query += "email=:Email ";
+            query += "email=:Email ";
             query += "WHERE useruuid=:uuid";
 
             try
@@ -947,8 +947,8 @@ public bool UpdateUserPreferences(ref UserPreferences pref,  ref string result)
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
                         cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail.ToString().ToLower ()));
-						cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible.ToString().ToLower ()));
-						cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ()));
+                        cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible.ToString().ToLower ()));
+                        cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ()));
                         cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString()));
 
                         lock(Lock)

diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -748,7 +748,7 @@ public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
             query += "UPDATE usersettings SET ";
             query += "imviaemail=:ImViaEmail, ";
             query += "visible=:Visible, ";
-			query += "email=:EMail ";
+            query += "email=:EMail ";
             query += "WHERE useruuid=:uuid";
 
             try
@@ -758,7 +758,7 @@ public bool UpdateUserPreferences(ref UserPreferences pref, ref string result)
                     cmd.CommandText = query;
                     cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail);
                     cmd.Parameters.AddWithValue(":Visible", pref.Visible);
-					cmd.Parameters.AddWithValue(":EMail", pref.EMail);
+                    cmd.Parameters.AddWithValue(":EMail", pref.EMail);
                     cmd.Parameters.AddWithValue(":uuid", pref.UserId.ToString());
 
                     cmd.ExecuteNonQuery();
@@ -798,7 +798,7 @@ public bool GetUserPreferences(ref UserPreferences pref, ref string result)
                         {
                             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
                          {