From 41cc73233c1d2e17222fdc510606032701690a60 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Mon, 24 Nov 2014 10:59:39 -0500 Subject: Re-work handling of email notifications settings. --- OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 3 --- OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | 3 --- OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 3 --- 3 files changed, 9 deletions(-) (limited to 'OpenSim/Data') 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 bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail); bool.TryParse((string)reader["visible"], out pref.Visible); pref.EMail = (string)reader["email"]; - - if(string.IsNullOrEmpty(pref.EMail)) - pref.EMail = "No EMail Address Provided"; } else { diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs index e263857..1ac952f 100644 --- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs +++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs @@ -902,9 +902,6 @@ namespace OpenSim.Data.PGSQL bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail); bool.TryParse((string)reader["visible"], out pref.Visible); pref.EMail = (string)reader["email"]; - - if(string.IsNullOrEmpty(pref.EMail)) - pref.EMail = "No EMail Address Provided"; } else { diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs index fd6a1c5..0a745fd 100644 --- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs @@ -799,9 +799,6 @@ namespace OpenSim.Data.SQLite bool.TryParse((string)reader["imviaemail"], out pref.IMViaEmail); bool.TryParse((string)reader["visible"], out pref.Visible); pref.EMail = (string)reader["email"]; - - if(string.IsNullOrEmpty(pref.EMail)) - pref.EMail = "No EMail Address Provided"; } else { -- cgit v1.1