OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
mb-throttle-test
Justin Clark-Casey (justincc) 2014-10-31 23:04:18 +00:00
parent aed4e96cf8
commit 8c9f82b035
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@ -921,8 +921,8 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
object Pref = (object)pref; object Pref = (object)pref;
if(!rpc.JsonRpcRequest(ref Pref, "user_preferences_request", serverURI, UUID.Random().ToString())) if(!rpc.JsonRpcRequest(ref Pref, "user_preferences_request", serverURI, UUID.Random().ToString()))
{ {
m_log.InfoFormat("[PROFILES]: UserPreferences request error"); // m_log.InfoFormat("[PROFILES]: UserPreferences request error");
remoteClient.SendAgentAlertMessage("Error requesting preferences", false); // remoteClient.SendAgentAlertMessage("Error requesting preferences", false);
return; return;
} }
pref = (UserPreferences) Pref; pref = (UserPreferences) Pref;

2
OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
View File

@ -402,7 +402,7 @@ namespace OpenSim.Server.Handlers
response.Error.Code = ErrorCode.InternalError; response.Error.Code = ErrorCode.InternalError;
response.Error.Message = string.Format("{0}", result); 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; return false;
} }