diff options
| author | Justin Clark-Casey (justincc) | 2009-10-05 20:20:00 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-10-05 20:20:00 +0100 |
| commit | 0f93ea5d9579e81df48c3d800bb0bb1d6d3bdc2f (patch) | |
| tree | e0a7033458b4bb0545f4c7f7d8aecc445fd276b3 /OpenSim/Services | |
| parent | change default ports for inventory and grid connectors in example .ini files ... (diff) | |
| parent | Fixed bug introduced in one of the last commits. (diff) | |
| download | opensim-SC_OLD-0f93ea5d9579e81df48c3d800bb0bb1d6d3bdc2f.zip opensim-SC_OLD-0f93ea5d9579e81df48c3d800bb0bb1d6d3bdc2f.tar.gz opensim-SC_OLD-0f93ea5d9579e81df48c3d800bb0bb1d6d3bdc2f.tar.bz2 opensim-SC_OLD-0f93ea5d9579e81df48c3d800bb0bb1d6d3bdc2f.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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"); |