From 8c9f82b03555306deb54601ba9a487336eb02203 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 31 Oct 2014 23:04:18 +0000 Subject: [PATCH] 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. --- .../CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 ++-- 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 8337a2fc41..c1795f6ef3 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 object Pref = (object)pref; if(!rpc.JsonRpcRequest(ref Pref, "user_preferences_request", serverURI, UUID.Random().ToString())) { - m_log.InfoFormat("[PROFILES]: UserPreferences request error"); - remoteClient.SendAgentAlertMessage("Error requesting preferences", false); +// m_log.InfoFormat("[PROFILES]: UserPreferences request error"); +// remoteClient.SendAgentAlertMessage("Error requesting preferences", false); return; } pref = (UserPreferences) Pref; diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs index d14355271d..49aa8bafcd 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs @@ -402,7 +402,7 @@ namespace OpenSim.Server.Handlers response.Error.Code = ErrorCode.InternalError; response.Error.Message = string.Format("{0}", result); - m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message); +// m_log.InfoFormat("[PROFILES]: User preferences request error - {0}", response.Error.Message); return false; }