aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-10-31 23:04:18 +0000
committerJustin Clark-Casey (justincc)2014-11-25 23:23:10 +0000
commit8c9f82b03555306deb54601ba9a487336eb02203 (patch)
tree64eaba293d6f0f63d9b2ba643398b6bdd79746bd /OpenSim/Region
parentUpdate libomv to cedac55 (diff)
downloadopensim-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/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs4
1 files changed, 2 insertions, 2 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;