diff options
author | Melanie | 2013-11-08 17:55:01 +0000 |
---|---|---|
committer | Melanie | 2013-11-08 17:55:01 +0000 |
commit | 91b70bf3fe382729a94d9a0855be8b07ef67c360 (patch) | |
tree | 3e42c4c536da6c7eaaf1a72ecdbd2a24de4d1658 /OpenSim/Services | |
parent | Merge branch 'master' into careminster (diff) | |
parent | If the LSL state_entry() event definition contains any parameters, then gener... (diff) | |
download | opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.zip opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.gz opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.bz2 opensim-SC_OLD-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Services')
-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 30bfb70..cc485f7 100644 --- a/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs +++ b/OpenSim/Services/Connectors/MapImage/MapImageServicesConnector.cs | |||
@@ -114,29 +114,32 @@ namespace OpenSim.Services.Connectors | |||
114 | } | 114 | } |
115 | else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure")) | 115 | else if (replyData.ContainsKey("Result") && (replyData["Result"].ToString().ToLower() == "failure")) |
116 | { | 116 | { |
117 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Registration failed: {0}", replyData["Message"].ToString()); | 117 | reason = string.Format("Map post to {0} failed: {1}", uri, replyData["Message"].ToString()); |
118 | reason = replyData["Message"].ToString(); | 118 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); |
119 | |||
119 | return false; | 120 | return false; |
120 | } | 121 | } |
121 | else if (!replyData.ContainsKey("Result")) | 122 | else if (!replyData.ContainsKey("Result")) |
122 | { | 123 | { |
123 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: reply data does not contain result field"); | 124 | reason = string.Format("Reply data from {0} does not contain result field", uri); |
125 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); | ||
124 | } | 126 | } |
125 | else | 127 | else |
126 | { | 128 | { |
127 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: unexpected result {0}", replyData["Result"].ToString()); | 129 | reason = string.Format("Unexpected result {0} from {1}" + replyData["Result"].ToString(), uri); |
128 | reason = "Unexpected result " + replyData["Result"].ToString(); | 130 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); |
129 | } | 131 | } |
130 | |||
131 | } | 132 | } |
132 | else | 133 | else |
133 | { | 134 | { |
134 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply"); | 135 | reason = string.Format("Map post received null reply from {0}", uri); |
136 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); | ||
135 | } | 137 | } |
136 | } | 138 | } |
137 | catch (Exception e) | 139 | catch (Exception e) |
138 | { | 140 | { |
139 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Exception when contacting map server at {0}: {1}", uri, e.Message); | 141 | reason = string.Format("Exception when posting to map server at {0}: {1}", uri, e.Message); |
142 | m_log.WarnFormat("[MAP IMAGE CONNECTOR]: {0}", reason); | ||
140 | } | 143 | } |
141 | finally | 144 | finally |
142 | { | 145 | { |