OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

mb-throttle-test
BlueWall 2014-11-25 19:27:28 -05:00
parent 86367d7219 a76aec8467
commit 62b778ca4d
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Data/MySQL/MySQLUserProfilesData.cs
View File

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

8
OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
View File

@ -901,7 +901,7 @@ namespace OpenSim.Data.PGSQL
reader.Read(); reader.Read();
bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail); bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
bool.TryParse((string)reader["visible"], out pref.Visible); bool.TryParse((string)reader["visible"], out pref.Visible);
pref.EMail = (string)reader["email"]; pref.EMail = (string)reader["email"];
} }
else else
{ {
@ -936,7 +936,7 @@ namespace OpenSim.Data.PGSQL
query += "UPDATE usersettings SET "; query += "UPDATE usersettings SET ";
query += "imviaemail=:ImViaEmail, "; query += "imviaemail=:ImViaEmail, ";
query += "visible=:Visible, "; query += "visible=:Visible, ";
query += "email=:Email "; query += "email=:Email ";
query += "WHERE useruuid=:uuid"; query += "WHERE useruuid=:uuid";
try try
@ -947,8 +947,8 @@ namespace OpenSim.Data.PGSQL
using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon)) using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
{ {
cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail.ToString().ToLower ())); 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("Visible", pref.Visible.ToString().ToLower ()));
cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ())); cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ()));
cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString())); cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString()));
lock(Lock) lock(Lock)

6
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
View File

@ -748,7 +748,7 @@ namespace OpenSim.Data.SQLite
query += "UPDATE usersettings SET "; query += "UPDATE usersettings SET ";
query += "imviaemail=:ImViaEmail, "; query += "imviaemail=:ImViaEmail, ";
query += "visible=:Visible, "; query += "visible=:Visible, ";
query += "email=:EMail "; query += "email=:EMail ";
query += "WHERE useruuid=:uuid"; query += "WHERE useruuid=:uuid";
try try
@ -758,7 +758,7 @@ namespace OpenSim.Data.SQLite
cmd.CommandText = query; cmd.CommandText = query;
cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail); cmd.Parameters.AddWithValue(":ImViaEmail", pref.IMViaEmail);
cmd.Parameters.AddWithValue(":Visible", pref.Visible); 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.Parameters.AddWithValue(":uuid", pref.UserId.ToString());
cmd.ExecuteNonQuery(); cmd.ExecuteNonQuery();
@ -798,7 +798,7 @@ namespace OpenSim.Data.SQLite
{ {
bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail); bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail);
bool.TryParse((string)reader["visible"], out pref.Visible); bool.TryParse((string)reader["visible"], out pref.Visible);
pref.EMail = (string)reader["email"]; pref.EMail = (string)reader["email"];
} }
else else
{ {