diff options
| author | Melanie | 2009-10-06 17:44:59 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-06 17:44:59 +0100 |
| commit | 0374f1b144f3faf35da39e3925e8abd4b2a8bd04 (patch) | |
| tree | 456d3d532c70d32564d35fc3cb9bbc81bdf08b2e /OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |
| parent | Make sure that keys exist in arrays before trying to access them. (diff) | |
| parent | Corrected words in error message. (diff) | |
| download | opensim-SC_OLD-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.zip opensim-SC_OLD-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.gz opensim-SC_OLD-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.bz2 opensim-SC_OLD-0374f1b144f3faf35da39e3925e8abd4b2a8bd04.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Services/Connectors/Grid/GridServiceConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index ba46b0d..acdf558 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |||
| @@ -109,8 +109,13 @@ namespace OpenSim.Services.Connectors | |||
| 109 | { | 109 | { |
| 110 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); | 110 | Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); |
| 111 | 111 | ||
| 112 | if ((replyData["Result"] != null) && (replyData["Result"].ToString().ToLower() == "success")) | 112 | if (replyData.ContainsKey("Result")&& (replyData["Result"].ToString().ToLower() == "success")) |
| 113 | return true; | 113 | return true; |
| 114 | else if (!replyData.ContainsKey("Result")) | ||
| 115 | m_log.DebugFormat("[GRID CONNECTOR]: reply data does not contain result field"); | ||
| 116 | else | ||
| 117 | m_log.DebugFormat("[GRID CONNECTOR]: unexpected result {0}", replyData["Result"].ToString()); | ||
| 118 | |||
| 114 | } | 119 | } |
| 115 | else | 120 | else |
| 116 | m_log.DebugFormat("[GRID CONNECTOR]: RegisterRegion received null reply"); | 121 | m_log.DebugFormat("[GRID CONNECTOR]: RegisterRegion received null reply"); |