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 ---
 OpenSim/Services/UserProfilesService/UserProfilesService.cs | 12 +++++++++++-
 4 files changed, 11 insertions(+), 10 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
                                 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
                          {
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 675cd07..75101ff 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -209,7 +209,10 @@ namespace OpenSim.Services.ProfilesService
                             pref.EMail = string.Empty;
                         }
                         else
+                        {
                             pref.EMail = account.Email;
+                            UserPreferencesUpdate(ref pref, ref result);
+                        }
                     }
                     catch
                     {
@@ -225,7 +228,14 @@ namespace OpenSim.Services.ProfilesService
                     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
 
-- 
cgit v1.1