diff options
author | Justin Clark-Casey (justincc) | 2014-02-14 00:16:17 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-02-14 00:16:17 +0000 |
commit | ffd0da23fb9041df730438a614161a5e3dbc2846 (patch) | |
tree | fc2bc9b58cf0f829ee7b81068cd59646b8ecfc67 /OpenSim/Region/CoreModules/Avatar/UserProfiles | |
parent | Merge branch 'justincc-master' (diff) | |
parent | Change warns associated with UserAgentServiceConnector to debugs, as this is ... (diff) | |
download | opensim-SC_OLD-ffd0da23fb9041df730438a614161a5e3dbc2846.zip opensim-SC_OLD-ffd0da23fb9041df730438a614161a5e3dbc2846.tar.gz opensim-SC_OLD-ffd0da23fb9041df730438a614161a5e3dbc2846.tar.bz2 opensim-SC_OLD-ffd0da23fb9041df730438a614161a5e3dbc2846.tar.xz |
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/UserProfiles')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index 2da0a74..f3e757a 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -1164,7 +1164,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
1164 | 1164 | ||
1165 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(home_url); | 1165 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(home_url); |
1166 | 1166 | ||
1167 | Dictionary<string, object> account = uConn.GetUserInfo(userID); | 1167 | Dictionary<string, object> account; |
1168 | try | ||
1169 | { | ||
1170 | account = uConn.GetUserInfo(userID); | ||
1171 | } | ||
1172 | catch (Exception e) | ||
1173 | { | ||
1174 | m_log.Debug("[PROFILES]: GetUserInfo call failed ", e); | ||
1175 | account = new Dictionary<string, object>(); | ||
1176 | } | ||
1168 | 1177 | ||
1169 | if (account.Count > 0) | 1178 | if (account.Count > 0) |
1170 | { | 1179 | { |