diff options
author | John Hurliman | 2009-10-05 17:38:27 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-05 17:38:27 -0700 |
commit | 7ddb6fbced5f2a98aa0201e354987ebc32adf7d2 (patch) | |
tree | 903b87112e7f851218e7b3d41c681f1b8f512af2 /OpenSim/Services/Connectors | |
parent | Beginning work on the new LLUDP implementation (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-7ddb6fbced5f2a98aa0201e354987ebc32adf7d2.zip opensim-SC_OLD-7ddb6fbced5f2a98aa0201e354987ebc32adf7d2.tar.gz opensim-SC_OLD-7ddb6fbced5f2a98aa0201e354987ebc32adf7d2.tar.bz2 opensim-SC_OLD-7ddb6fbced5f2a98aa0201e354987ebc32adf7d2.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index b1d41da..6f7c90f 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
@@ -171,6 +171,8 @@ namespace OpenSim.Services.Connectors | |||
171 | 171 | ||
172 | if (asset == null) | 172 | if (asset == null) |
173 | { | 173 | { |
174 | bool result = false; | ||
175 | |||
174 | AsynchronousRestObjectRequester. | 176 | AsynchronousRestObjectRequester. |
175 | MakeRequest<int, AssetBase>("GET", uri, 0, | 177 | MakeRequest<int, AssetBase>("GET", uri, 0, |
176 | delegate(AssetBase a) | 178 | delegate(AssetBase a) |
@@ -178,8 +180,10 @@ namespace OpenSim.Services.Connectors | |||
178 | if (m_Cache != null) | 180 | if (m_Cache != null) |
179 | m_Cache.Cache(a); | 181 | m_Cache.Cache(a); |
180 | handler(id, sender, a); | 182 | handler(id, sender, a); |
183 | result = true; | ||
181 | }); | 184 | }); |
182 | 185 | ||
186 | return result; | ||
183 | } | 187 | } |
184 | else | 188 | else |
185 | { | 189 | { |
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"); |