diff options
| author | BlueWall | 2014-11-24 10:59:39 -0500 |
|---|---|---|
| committer | BlueWall | 2014-11-24 11:00:47 -0500 |
| commit | 41cc73233c1d2e17222fdc510606032701690a60 (patch) | |
| tree | 2f28306a11d19b36c7bbeadf1a4bc868f39cd259 /OpenSim/Data | |
| parent | Fix handling of user preference updates where no email address is supplied (diff) | |
| download | opensim-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')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 3 |
3 files changed, 0 insertions, 9 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 | { |
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 | |||
| 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 | |||
| 906 | if(string.IsNullOrEmpty(pref.EMail)) | ||
| 907 | pref.EMail = "No EMail Address Provided"; | ||
| 908 | } | 905 | } |
| 909 | else | 906 | else |
| 910 | { | 907 | { |
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 | |||
| 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 | |||
| 803 | if(string.IsNullOrEmpty(pref.EMail)) | ||
| 804 | pref.EMail = "No EMail Address Provided"; | ||
| 805 | } | 802 | } |
| 806 | else | 803 | else |
| 807 | { | 804 | { |