aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs3
-rw-r--r--OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs3
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserProfilesData.cs3
-rw-r--r--OpenSim/Services/UserProfilesService/UserProfilesService.cs12
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
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 {
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
209 pref.EMail = string.Empty; 209 pref.EMail = string.Empty;
210 } 210 }
211 else 211 else
212 {
212 pref.EMail = account.Email; 213 pref.EMail = account.Email;
214 UserPreferencesUpdate(ref pref, ref result);
215 }
213 } 216 }
214 catch 217 catch
215 { 218 {
@@ -225,7 +228,14 @@ namespace OpenSim.Services.ProfilesService
225 return false; 228 return false;
226 } 229 }
227 } 230 }
228 return ProfilesData.GetUserPreferences(ref pref, ref result); 231 if (!ProfilesData.GetUserPreferences (ref pref, ref result))
232 return false;
233
234
235 if(string.IsNullOrEmpty(pref.EMail))
236 pref.EMail = "No Email Address On Record";
237
238 return true;
229 } 239 }
230 #endregion User Preferences 240 #endregion User Preferences
231 241