aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorBlueWall2014-11-24 10:59:39 -0500
committerBlueWall2014-11-24 11:00:47 -0500
commit41cc73233c1d2e17222fdc510606032701690a60 (patch)
tree2f28306a11d19b36c7bbeadf1a4bc868f39cd259 /OpenSim/Data/MySQL
parentFix handling of user preference updates where no email address is supplied (diff)
downloadopensim-SC_OLD-41cc73233c1d2e17222fdc510606032701690a60.zip
opensim-SC_OLD-41cc73233c1d2e17222fdc510606032701690a60.tar.gz
opensim-SC_OLD-41cc73233c1d2e17222fdc510606032701690a60.tar.bz2
opensim-SC_OLD-41cc73233c1d2e17222fdc510606032701690a60.tar.xz
Re-work handling of email notifications settings.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index da05ff0..0dd9e2f 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -916,9 +916,6 @@ namespace OpenSim.Data.MySQL
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
920 if(string.IsNullOrEmpty(pref.EMail))
921 pref.EMail = "No EMail Address Provided";
922 } 919 }
923 else 920 else
924 { 921 {