aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2014-11-25 19:27:15 -0500
committerBlueWall2014-11-25 19:27:15 -0500
commita76aec8467439a4c4c2249656fe84a9ee5b9426c (patch)
tree108f6909f20ae5369abc928b3fae04f4f38594f0
parentRe-work handling of email notifications settings. (diff)
downloadopensim-SC_OLD-a76aec8467439a4c4c2249656fe84a9ee5b9426c.zip
opensim-SC_OLD-a76aec8467439a4c4c2249656fe84a9ee5b9426c.tar.gz
opensim-SC_OLD-a76aec8467439a4c4c2249656fe84a9ee5b9426c.tar.bz2
opensim-SC_OLD-a76aec8467439a4c4c2249656fe84a9ee5b9426c.tar.xz
Fix whitespace hoping to avoid a flogging
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs10
-rw-r--r--OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs8
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserProfilesData.cs6
3 files changed, 12 insertions, 12 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
915 reader.Read(); 915 reader.Read();
916 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail); 916 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
917 bool.TryParse((string)reader["visible"], out pref.Visible); 917 bool.TryParse((string)reader["visible"], out pref.Visible);
918 pref.EMail = (string)reader["email"]; 918 pref.EMail = (string)reader["email"];
919 } 919 }
920 else 920 else
921 { 921 {
@@ -955,7 +955,7 @@ namespace OpenSim.Data.MySQL
955 query += "UPDATE usersettings SET "; 955 query += "UPDATE usersettings SET ";
956 query += "imviaemail=?ImViaEmail, "; 956 query += "imviaemail=?ImViaEmail, ";
957 query += "visible=?Visible, "; 957 query += "visible=?Visible, ";
958 query += "email=?EMail "; 958 query += "email=?EMail ";
959 query += "WHERE useruuid=?uuid"; 959 query += "WHERE useruuid=?uuid";
960 960
961 try 961 try
@@ -967,8 +967,8 @@ namespace OpenSim.Data.MySQL
967 { 967 {
968 cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail.ToString().ToLower()); 968 cmd.Parameters.AddWithValue("?ImViaEmail", pref.IMViaEmail.ToString().ToLower());
969 cmd.Parameters.AddWithValue("?Visible", pref.Visible.ToString().ToLower()); 969 cmd.Parameters.AddWithValue("?Visible", pref.Visible.ToString().ToLower());
970 cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString()); 970 cmd.Parameters.AddWithValue("?uuid", pref.UserId.ToString());
971 cmd.Parameters.AddWithValue("?EMail", pref.EMail.ToString().ToLower()); 971 cmd.Parameters.AddWithValue("?EMail", pref.EMail.ToString().ToLower());
972 972
973 cmd.ExecuteNonQuery(); 973 cmd.ExecuteNonQuery();
974 } 974 }
@@ -977,7 +977,7 @@ namespace OpenSim.Data.MySQL
977 catch (Exception e) 977 catch (Exception e)
978 { 978 {
979 m_log.ErrorFormat("[PROFILES_DATA]" + 979 m_log.ErrorFormat("[PROFILES_DATA]" +
980 ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException); 980 ": UserPreferencesUpdate exception {0} {1}", e.Message, e.InnerException);
981 result = e.Message; 981 result = e.Message;
982 return false; 982 return false;
983 } 983 }
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index 1ac952f..f8b9ede 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -901,7 +901,7 @@ namespace OpenSim.Data.PGSQL
901 reader.Read(); 901 reader.Read();
902 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail); 902 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
903 bool.TryParse((string)reader["visible"], out pref.Visible); 903 bool.TryParse((string)reader["visible"], out pref.Visible);
904 pref.EMail = (string)reader["email"]; 904 pref.EMail = (string)reader["email"];
905 } 905 }
906 else 906 else
907 { 907 {
@@ -936,7 +936,7 @@ namespace OpenSim.Data.PGSQL
936 query += "UPDATE usersettings SET "; 936 query += "UPDATE usersettings SET ";
937 query += "imviaemail=:ImViaEmail, "; 937 query += "imviaemail=:ImViaEmail, ";
938 query += "visible=:Visible, "; 938 query += "visible=:Visible, ";
939 query += "email=:Email "; 939 query += "email=:Email ";
940 query += "WHERE useruuid=:uuid"; 940 query += "WHERE useruuid=:uuid";
941 941
942 try 942 try
@@ -947,8 +947,8 @@ namespace OpenSim.Data.PGSQL
947 using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon)) 947 using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
948 { 948 {
949 cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail.ToString().ToLower ())); 949 cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail.ToString().ToLower ()));
950 cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible.ToString().ToLower ())); 950 cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible.ToString().ToLower ()));
951 cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ())); 951 cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ()));
952 cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString())); 952 cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString()));
953 953
954 lock(Lock) 954 lock(Lock)
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 0a745fd..790843b 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -748,7 +748,7 @@ namespace OpenSim.Data.SQLite
748 query += "UPDATE usersettings SET "; 748 query += "UPDATE usersettings SET ";
749 query += "imviaemail=:ImViaEmail, "; 749 query += "imviaemail=:ImViaEmail, ";
750 query += "visible=:Visible, "; 750 query += "visible=:Visible, ";
751 query += "email=:EMail "; 751 query += "email=:EMail ";
752 query += "WHERE useruuid=:uuid"; 752 query += "WHERE useruuid=:uuid";
753 753
754 try 754 try
@@ -758,7 +758,7 @@ namespace OpenSim.Data.SQLite
758 cmd.CommandText = query; 758 cmd.CommandText = query;
759 cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail); 759 cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail);
760 cmd.Parameters.AddWithValue(":Visible", pref.Visible); 760 cmd.Parameters.AddWithValue(":Visible", pref.Visible);
761 cmd.Parameters.AddWithValue(":EMail", pref.EMail); 761 cmd.Parameters.AddWithValue(":EMail", pref.EMail);
762 cmd.Parameters.AddWithValue(":uuid", pref.UserId.ToString()); 762 cmd.Parameters.AddWithValue(":uuid", pref.UserId.ToString());
763 763
764 cmd.ExecuteNonQuery(); 764 cmd.ExecuteNonQuery();
@@ -798,7 +798,7 @@ namespace OpenSim.Data.SQLite
798 { 798 {
799 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail); 799 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
800 bool.TryParse((string)reader["visible"], out pref.Visible); 800 bool.TryParse((string)reader["visible"], out pref.Visible);
801 pref.EMail = (string)reader["email"]; 801 pref.EMail = (string)reader["email"];
802 } 802 }
803 else 803 else
804 { 804 {