diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs index 267dd71..725204d 100644 --- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs +++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs | |||
@@ -174,29 +174,32 @@ namespace OpenSim.Services.Connectors | |||
174 | } | 174 | } |
175 | else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure")) | 175 | else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure")) |
176 | { | 176 | { |
177 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Registration failed: {0}", replyData["Message"].ToString()); | 177 | reason = string.Format("Map post to {0} failed: {1}", uri, replyData["Message"].ToString()); |
178 | reason = replyData["Message"].ToString(); | 178 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); |
179 | |||
179 | return false; | 180 | return false; |
180 | } | 181 | } |
181 | else if (!replyData.ContainsKey("Result")) | 182 | else if (!replyData.ContainsKey("Result")) |
182 | { | 183 | { |
183 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: reply data does not contain result field"); | 184 | reason = string.Format("Reply data from {0} does not contain result field", uri); |
185 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); | ||
184 | } | 186 | } |
185 | else | 187 | else |
186 | { | 188 | { |
187 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: unexpected result {0}", replyData["Result"].ToString()); | 189 | reason = string.Format("Unexpected result {0} from {1}" + replyData["Result"].ToString(), uri); |
188 | reason = "Unexpected result " + replyData["Result"].ToString(); | 190 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); |
189 | } | 191 | } |
190 | |||
191 | } | 192 | } |
192 | else | 193 | else |
193 | { | 194 | { |
194 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply"); | 195 | reason = string.Format("Map post received null reply from {0}", uri); |
196 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); | ||
195 | } | 197 | } |
196 | } | 198 | } |
197 | catch (Exception e) | 199 | catch (Exception e) |
198 | { | 200 | { |
199 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Exception when contacting map server at {0}: {1}", uri, e.Message); | 201 | reason = string.Format("Exception when posting to map server at {0}: {1}", uri, e.Message); |
202 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); | ||
200 | } | 203 | } |
201 | finally | 204 | finally |
202 | { | 205 | { |