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/Services/UserProfilesService/UserProfilesService.cs | |
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 '')
-rw-r--r-- | OpenSim/Services/UserProfilesService/UserProfilesService.cs | 12 |
1 files changed, 11 insertions, 1 deletions
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 | ||