diff options
| author | Freaky Tech | 2015-03-02 22:03:26 +0100 |
|---|---|---|
| committer | BlueWall | 2015-03-03 15:35:16 -0500 |
| commit | 6161817f72e88252fbf587f25a26f2975114e365 (patch) | |
| tree | 15a4c536aa4fd4d5f4647921c079d9fd34092de7 | |
| parent | XML should not contain any BOM. Disabled BOM generation in BaseHttpServer (diff) | |
| download | opensim-SC-6161817f72e88252fbf587f25a26f2975114e365.zip opensim-SC-6161817f72e88252fbf587f25a26f2975114e365.tar.gz opensim-SC-6161817f72e88252fbf587f25a26f2975114e365.tar.bz2 opensim-SC-6161817f72e88252fbf587f25a26f2975114e365.tar.xz | |
corrected handling when XML parsing in Presence Connector fails
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| -rw-r--r-- | OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs index aade714..63f3f37 100644 --- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs +++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs | |||
| @@ -301,6 +301,7 @@ namespace OpenSim.Services.Connectors | |||
| 301 | catch (Exception e) | 301 | catch (Exception e) |
| 302 | { | 302 | { |
| 303 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message); | 303 | m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message); |
| 304 | return null; | ||
| 304 | } | 305 | } |
| 305 | 306 | ||
| 306 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 307 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |