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

Re-work handling of email notifications settings.

mb-throttle-test
BlueWall 2014-11-24 10:59:39 -05:00
parent 12108bf6e9
commit 41cc73233c
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -916,9 +916,6 @@ namespace OpenSim.Data.MySQL
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"];
if(string.IsNullOrEmpty(pref.EMail))
pref.EMail = "No EMail Address Provided";
} }
else else
{ {

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

@ -902,9 +902,6 @@ namespace OpenSim.Data.PGSQL
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"];
if(string.IsNullOrEmpty(pref.EMail))
pref.EMail = "No EMail Address Provided";
} }
else else
{ {

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

@ -799,9 +799,6 @@ 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"];
if(string.IsNullOrEmpty(pref.EMail))
pref.EMail = "No EMail Address Provided";
} }
else else
{ {

12
OpenSim/Services/UserProfilesService/UserProfilesService.cs
View File

@ -209,7 +209,10 @@ namespace OpenSim.Services.ProfilesService
pref.EMail = string.Empty; pref.EMail = string.Empty;
} }
else else
{
pref.EMail = account.Email; pref.EMail = account.Email;
UserPreferencesUpdate(ref pref, ref result);
}
} }
catch catch
{ {
@ -225,7 +228,14 @@ namespace OpenSim.Services.ProfilesService
return false; return false;
} }
} }
return ProfilesData.GetUserPreferences(ref pref, ref result); if (!ProfilesData.GetUserPreferences (ref pref, ref result))
return false;
if(string.IsNullOrEmpty(pref.EMail))
pref.EMail = "No Email Address On Record";
return true;
} }
#endregion User Preferences #endregion User Preferences