diff options
author | Justin Clark-Casey (justincc) | 2014-10-31 23:04:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:23:10 +0000 |
commit | 8c9f82b03555306deb54601ba9a487336eb02203 (patch) | |
tree | 64eaba293d6f0f63d9b2ba643398b6bdd79746bd /OpenSim | |
parent | Update libomv to cedac55 (diff) | |
download | opensim-SC-8c9f82b03555306deb54601ba9a487336eb02203.zip opensim-SC-8c9f82b03555306deb54601ba9a487336eb02203.tar.gz opensim-SC-8c9f82b03555306deb54601ba9a487336eb02203.tar.bz2 opensim-SC-8c9f82b03555306deb54601ba9a487336eb02203.tar.xz |
Just for now, don't alert the user or log if we couldn't change their server-side preferences due to no e-mail address being sent.
This is to avoid user confusion in the oscc rehearsal as they are often not aware that this fails because no e-mail is set.
Also may be failing in the hypergrid case, though this may also be a config issue.
This is meant as a temporary solution.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index 8337a2f..c1795f6 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -921,8 +921,8 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles | |||
921 | object Pref = (object)pref; | 921 | object Pref = (object)pref; |
922 | if(!rpc.JsonRpcRequest(ref Pref, "user_preferences_request", serverURI, UUID.Random().ToString())) | 922 | if(!rpc.JsonRpcRequest(ref Pref, "user_preferences_request", serverURI, UUID.Random().ToString())) |
923 | { | 923 | { |
924 | m_log.InfoFormat("[PROFILES]: UserPreferences request error"); | 924 | // m_log.InfoFormat("[PROFILES]: UserPreferences request error"); |
925 | remoteClient.SendAgentAlertMessage("Error requesting preferences", false); | 925 | // remoteClient.SendAgentAlertMessage("Error requesting preferences", false); |
926 | return; | 926 | return; |
927 | } | 927 | } |
928 | pref = (UserPreferences) Pref; | 928 | pref = (UserPreferences) Pref; |
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs index d143552..49aa8ba 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | |||
@@ -402,7 +402,7 @@ namespace OpenSim.Server.Handlers | |||
402 | 402 | ||
403 | response.Error.Code = ErrorCode.InternalError; | 403 | response.Error.Code = ErrorCode.InternalError; |
404 | response.Error.Message = string.Format("{0}", result); | 404 | response.Error.Message = string.Format("{0}", result); |
405 | m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message); | 405 | // m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message); |
406 | return false; | 406 | return false; |
407 | } | 407 | } |
408 | 408 | ||