diff options
| author | Justin Clark-Casey (justincc) | 2014-02-13 23:55:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-02-14 00:01:12 +0000 |
| commit | fc35b45e2176ee2dc8bf5627e84e463a2e9d3a52 (patch) | |
| tree | 6f0e2c67c462543a052783cb1390070b7b58fe96 /OpenSim/Services/HypergridService | |
| parent | If a caller tries to queue a CAPs message to a scene presence that has no eve... (diff) | |
| download | opensim-SC_OLD-fc35b45e2176ee2dc8bf5627e84e463a2e9d3a52.zip opensim-SC_OLD-fc35b45e2176ee2dc8bf5627e84e463a2e9d3a52.tar.gz opensim-SC_OLD-fc35b45e2176ee2dc8bf5627e84e463a2e9d3a52.tar.bz2 opensim-SC_OLD-fc35b45e2176ee2dc8bf5627e84e463a2e9d3a52.tar.xz | |
If calls to UserAgentServiceConnector fail then throw an exception. This lets the caller decide whether to discard the error or not.
This is Oren Hurvitz's 0001 patch from http://opensimulator.org/mantis/view.php?id=6956 but I ended up doing some tweaking to resolve patch application issues.
Diffstat (limited to 'OpenSim/Services/HypergridService')
| -rw-r--r-- | OpenSim/Services/HypergridService/HGInstantMessageService.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index e8d7cca..9b7b278 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
| @@ -215,7 +215,15 @@ namespace OpenSim.Services.HypergridService | |||
| 215 | { | 215 | { |
| 216 | // Let's check with the UAS if the user is elsewhere | 216 | // Let's check with the UAS if the user is elsewhere |
| 217 | m_log.DebugFormat("[HG IM SERVICE]: User is not present. Checking location with User Agent service"); | 217 | m_log.DebugFormat("[HG IM SERVICE]: User is not present. Checking location with User Agent service"); |
| 218 | url = m_UserAgentService.LocateUser(toAgentID); | 218 | try |
| 219 | { | ||
| 220 | url = m_UserAgentService.LocateUser(toAgentID); | ||
| 221 | } | ||
| 222 | catch (Exception e) | ||
| 223 | { | ||
| 224 | m_log.Warn("[HG IM SERVICE]: LocateUser call failed ", e); | ||
| 225 | url = string.Empty; | ||
| 226 | } | ||
| 219 | } | 227 | } |
| 220 | 228 | ||
| 221 | // check if we've tried this before.. | 229 | // check if we've tried this before.. |