aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs40
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs22
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs9
-rw-r--r--OpenSim/Services/Connectors/Grid/GridServiceConnector.cs72
-rw-r--r--OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs15
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs15
-rw-r--r--OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs5
-rw-r--r--OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs30
-rw-r--r--OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs15
9 files changed, 120 insertions, 103 deletions
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
index 8fdb4d0..ddfca57 100644
--- a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
@@ -110,12 +110,11 @@ namespace OpenSim.Services.Connectors
110 110
111 string reply = string.Empty; 111 string reply = string.Empty;
112 string reqString = ServerUtils.BuildQueryString(sendData); 112 string reqString = ServerUtils.BuildQueryString(sendData);
113 string uri = m_ServerURI + "/avatar";
113 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString); 114 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
114 try 115 try
115 { 116 {
116 reply = SynchronousRestFormsRequester.MakeRequest("POST", 117 reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
117 m_ServerURI + "/avatar",
118 reqString);
119 if (reply == null || (reply != null && reply == string.Empty)) 118 if (reply == null || (reply != null && reply == string.Empty))
120 { 119 {
121 m_log.DebugFormat("[AVATAR CONNECTOR]: GetAgent received null or empty reply"); 120 m_log.DebugFormat("[AVATAR CONNECTOR]: GetAgent received null or empty reply");
@@ -124,7 +123,7 @@ namespace OpenSim.Services.Connectors
124 } 123 }
125 catch (Exception e) 124 catch (Exception e)
126 { 125 {
127 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting presence server: {0}", e.Message); 126 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
128 } 127 }
129 128
130 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 129 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -159,12 +158,11 @@ namespace OpenSim.Services.Connectors
159 158
160 159
161 string reqString = ServerUtils.BuildQueryString(sendData); 160 string reqString = ServerUtils.BuildQueryString(sendData);
161 string uri = m_ServerURI + "/avatar";
162 //m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString); 162 //m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
163 try 163 try
164 { 164 {
165 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 165 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
166 m_ServerURI + "/avatar",
167 reqString);
168 if (reply != string.Empty) 166 if (reply != string.Empty)
169 { 167 {
170 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 168 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -177,15 +175,18 @@ namespace OpenSim.Services.Connectors
177 return false; 175 return false;
178 } 176 }
179 else 177 else
178 {
180 m_log.DebugFormat("[AVATAR CONNECTOR]: SetAvatar reply data does not contain result field"); 179 m_log.DebugFormat("[AVATAR CONNECTOR]: SetAvatar reply data does not contain result field");
181 180 }
182 } 181 }
183 else 182 else
183 {
184 m_log.DebugFormat("[AVATAR CONNECTOR]: SetAvatar received empty reply"); 184 m_log.DebugFormat("[AVATAR CONNECTOR]: SetAvatar received empty reply");
185 }
185 } 186 }
186 catch (Exception e) 187 catch (Exception e)
187 { 188 {
188 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting avatar server: {0}", e.Message); 189 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
189 } 190 }
190 191
191 return false; 192 return false;
@@ -202,12 +203,11 @@ namespace OpenSim.Services.Connectors
202 sendData["UserID"] = userID.ToString(); 203 sendData["UserID"] = userID.ToString();
203 204
204 string reqString = ServerUtils.BuildQueryString(sendData); 205 string reqString = ServerUtils.BuildQueryString(sendData);
206 string uri = m_ServerURI + "/avatar";
205 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString); 207 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
206 try 208 try
207 { 209 {
208 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 210 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
209 m_ServerURI + "/avatar",
210 reqString);
211 if (reply != string.Empty) 211 if (reply != string.Empty)
212 { 212 {
213 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 213 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -228,7 +228,7 @@ namespace OpenSim.Services.Connectors
228 } 228 }
229 catch (Exception e) 229 catch (Exception e)
230 { 230 {
231 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting avatar server: {0}", e.Message); 231 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
232 } 232 }
233 233
234 return false; 234 return false;
@@ -246,12 +246,11 @@ namespace OpenSim.Services.Connectors
246 sendData["Values"] = new List<string>(values); 246 sendData["Values"] = new List<string>(values);
247 247
248 string reqString = ServerUtils.BuildQueryString(sendData); 248 string reqString = ServerUtils.BuildQueryString(sendData);
249 string uri = m_ServerURI + "/avatar";
249 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString); 250 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
250 try 251 try
251 { 252 {
252 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 253 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
253 m_ServerURI + "/avatar",
254 reqString);
255 if (reply != string.Empty) 254 if (reply != string.Empty)
256 { 255 {
257 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 256 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -272,7 +271,7 @@ namespace OpenSim.Services.Connectors
272 } 271 }
273 catch (Exception e) 272 catch (Exception e)
274 { 273 {
275 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting avatar server: {0}", e.Message); 274 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
276 } 275 }
277 276
278 return false; 277 return false;
@@ -290,12 +289,11 @@ namespace OpenSim.Services.Connectors
290 sendData["Names"] = new List<string>(names); 289 sendData["Names"] = new List<string>(names);
291 290
292 string reqString = ServerUtils.BuildQueryString(sendData); 291 string reqString = ServerUtils.BuildQueryString(sendData);
292 string uri = m_ServerURI + "/avatar";
293 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString); 293 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);
294 try 294 try
295 { 295 {
296 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 296 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
297 m_ServerURI + "/avatar",
298 reqString);
299 if (reply != string.Empty) 297 if (reply != string.Empty)
300 { 298 {
301 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 299 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -316,7 +314,7 @@ namespace OpenSim.Services.Connectors
316 } 314 }
317 catch (Exception e) 315 catch (Exception e)
318 { 316 {
319 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting avatar server: {0}", e.Message); 317 m_log.DebugFormat("[AVATAR CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
320 } 318 }
321 319
322 return false; 320 return false;
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index 41361ab..44138c9 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -108,12 +108,11 @@ namespace OpenSim.Services.Connectors.Friends
108 protected FriendInfo[] GetFriends(Dictionary<string, object> sendData, string PrincipalID) 108 protected FriendInfo[] GetFriends(Dictionary<string, object> sendData, string PrincipalID)
109 { 109 {
110 string reqString = ServerUtils.BuildQueryString(sendData); 110 string reqString = ServerUtils.BuildQueryString(sendData);
111 string uri = m_ServerURI + "/friends";
111 112
112 try 113 try
113 { 114 {
114 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 115 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
115 m_ServerURI + "/friends",
116 reqString);
117 if (reply != string.Empty) 116 if (reply != string.Empty)
118 { 117 {
119 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 118 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -143,7 +142,6 @@ namespace OpenSim.Services.Connectors.Friends
143 // Success 142 // Success
144 return finfos.ToArray(); 143 return finfos.ToArray();
145 } 144 }
146
147 else 145 else
148 m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: GetFriends {0} received null response", 146 m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: GetFriends {0} received null response",
149 PrincipalID); 147 PrincipalID);
@@ -152,7 +150,7 @@ namespace OpenSim.Services.Connectors.Friends
152 } 150 }
153 catch (Exception e) 151 catch (Exception e)
154 { 152 {
155 m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message); 153 m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message);
156 } 154 }
157 155
158 return new FriendInfo[0]; 156 return new FriendInfo[0];
@@ -167,15 +165,14 @@ namespace OpenSim.Services.Connectors.Friends
167 sendData["METHOD"] = "storefriend"; 165 sendData["METHOD"] = "storefriend";
168 166
169 string reply = string.Empty; 167 string reply = string.Empty;
168 string uri = m_ServerURI + "/friends";
170 try 169 try
171 { 170 {
172 reply = SynchronousRestFormsRequester.MakeRequest("POST", 171 reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
173 m_ServerURI + "/friends",
174 ServerUtils.BuildQueryString(sendData));
175 } 172 }
176 catch (Exception e) 173 catch (Exception e)
177 { 174 {
178 m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message); 175 m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message);
179 return false; 176 return false;
180 } 177 }
181 178
@@ -223,15 +220,14 @@ namespace OpenSim.Services.Connectors.Friends
223 public bool Delete(Dictionary<string, object> sendData, string PrincipalID, string Friend) 220 public bool Delete(Dictionary<string, object> sendData, string PrincipalID, string Friend)
224 { 221 {
225 string reply = string.Empty; 222 string reply = string.Empty;
223 string uri = m_ServerURI = "/friends";
226 try 224 try
227 { 225 {
228 reply = SynchronousRestFormsRequester.MakeRequest("POST", 226 reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
229 m_ServerURI + "/friends",
230 ServerUtils.BuildQueryString(sendData));
231 } 227 }
232 catch (Exception e) 228 catch (Exception e)
233 { 229 {
234 m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message); 230 m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message);
235 return false; 231 return false;
236 } 232 }
237 233
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index d0a20fc..eea9853 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -139,12 +139,11 @@ namespace OpenSim.Services.Connectors.Friends
139 return false; 139 return false;
140 140
141 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort); 141 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort);
142 string uri = "http://" + region.ExternalHostName + ":" + region.HttpPort + "/friends";
143
142 try 144 try
143 { 145 {
144 string url = "http://" + region.ExternalHostName + ":" + region.HttpPort; 146 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
145 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
146 url + "/friends",
147 reqString);
148 if (reply != string.Empty) 147 if (reply != string.Empty)
149 { 148 {
150 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 149 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -165,7 +164,7 @@ namespace OpenSim.Services.Connectors.Friends
165 } 164 }
166 catch (Exception e) 165 catch (Exception e)
167 { 166 {
168 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim: {0}", e.ToString()); 167 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
169 } 168 }
170 169
171 return false; 170 return false;
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
index e57f28b..1599a56 100644
--- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -98,12 +98,11 @@ namespace OpenSim.Services.Connectors
98 sendData["METHOD"] = "register"; 98 sendData["METHOD"] = "register";
99 99
100 string reqString = ServerUtils.BuildQueryString(sendData); 100 string reqString = ServerUtils.BuildQueryString(sendData);
101 string uri = m_ServerURI + "/grid";
101 // m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString); 102 // m_log.DebugFormat("[GRID CONNECTOR]: queryString = {0}", reqString);
102 try 103 try
103 { 104 {
104 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 105 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
105 m_ServerURI + "/grid",
106 reqString);
107 if (reply != string.Empty) 106 if (reply != string.Empty)
108 { 107 {
109 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 108 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -133,7 +132,7 @@ namespace OpenSim.Services.Connectors
133 } 132 }
134 catch (Exception e) 133 catch (Exception e)
135 { 134 {
136 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 135 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
137 } 136 }
138 137
139 return "Error communicating with grid service"; 138 return "Error communicating with grid service";
@@ -147,11 +146,12 @@ namespace OpenSim.Services.Connectors
147 146
148 sendData["METHOD"] = "deregister"; 147 sendData["METHOD"] = "deregister";
149 148
149 string uri = m_ServerURI + "/grid";
150
150 try 151 try
151 { 152 {
152 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 153 string reply
153 m_ServerURI + "/grid", 154 = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
154 ServerUtils.BuildQueryString(sendData));
155 155
156 if (reply != string.Empty) 156 if (reply != string.Empty)
157 { 157 {
@@ -165,7 +165,7 @@ namespace OpenSim.Services.Connectors
165 } 165 }
166 catch (Exception e) 166 catch (Exception e)
167 { 167 {
168 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 168 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
169 } 169 }
170 170
171 return false; 171 return false;
@@ -184,15 +184,15 @@ namespace OpenSim.Services.Connectors
184 184
185 string reqString = ServerUtils.BuildQueryString(sendData); 185 string reqString = ServerUtils.BuildQueryString(sendData);
186 string reply = string.Empty; 186 string reply = string.Empty;
187 string uri = m_ServerURI + "/grid";
188
187 try 189 try
188 { 190 {
189 reply = SynchronousRestFormsRequester.MakeRequest("POST", 191 reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
190 m_ServerURI + "/grid",
191 reqString);
192 } 192 }
193 catch (Exception e) 193 catch (Exception e)
194 { 194 {
195 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 195 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
196 return rinfos; 196 return rinfos;
197 } 197 }
198 198
@@ -228,15 +228,14 @@ namespace OpenSim.Services.Connectors
228 sendData["METHOD"] = "get_region_by_uuid"; 228 sendData["METHOD"] = "get_region_by_uuid";
229 229
230 string reply = string.Empty; 230 string reply = string.Empty;
231 string uri = m_ServerURI + "/grid";
231 try 232 try
232 { 233 {
233 reply = SynchronousRestFormsRequester.MakeRequest("POST", 234 reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
234 m_ServerURI + "/grid",
235 ServerUtils.BuildQueryString(sendData));
236 } 235 }
237 catch (Exception e) 236 catch (Exception e)
238 { 237 {
239 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 238 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
240 return null; 239 return null;
241 } 240 }
242 241
@@ -274,15 +273,16 @@ namespace OpenSim.Services.Connectors
274 273
275 sendData["METHOD"] = "get_region_by_position"; 274 sendData["METHOD"] = "get_region_by_position";
276 string reply = string.Empty; 275 string reply = string.Empty;
276 string uri = m_ServerURI + "/grid";
277 try 277 try
278 { 278 {
279 reply = SynchronousRestFormsRequester.MakeRequest("POST", 279 reply = SynchronousRestFormsRequester.MakeRequest("POST",
280 m_ServerURI + "/grid", 280 uri,
281 ServerUtils.BuildQueryString(sendData)); 281 ServerUtils.BuildQueryString(sendData));
282 } 282 }
283 catch (Exception e) 283 catch (Exception e)
284 { 284 {
285 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 285 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
286 return null; 286 return null;
287 } 287 }
288 288
@@ -318,15 +318,16 @@ namespace OpenSim.Services.Connectors
318 318
319 sendData["METHOD"] = "get_region_by_name"; 319 sendData["METHOD"] = "get_region_by_name";
320 string reply = string.Empty; 320 string reply = string.Empty;
321 string uri = m_ServerURI + "/grid";
321 try 322 try
322 { 323 {
323 reply = SynchronousRestFormsRequester.MakeRequest("POST", 324 reply = SynchronousRestFormsRequester.MakeRequest("POST",
324 m_ServerURI + "/grid", 325 uri,
325 ServerUtils.BuildQueryString(sendData)); 326 ServerUtils.BuildQueryString(sendData));
326 } 327 }
327 catch (Exception e) 328 catch (Exception e)
328 { 329 {
329 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 330 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
330 return null; 331 return null;
331 } 332 }
332 333
@@ -361,15 +362,16 @@ namespace OpenSim.Services.Connectors
361 sendData["METHOD"] = "get_regions_by_name"; 362 sendData["METHOD"] = "get_regions_by_name";
362 List<GridRegion> rinfos = new List<GridRegion>(); 363 List<GridRegion> rinfos = new List<GridRegion>();
363 string reply = string.Empty; 364 string reply = string.Empty;
365 string uri = m_ServerURI + "/grid";
364 try 366 try
365 { 367 {
366 reply = SynchronousRestFormsRequester.MakeRequest("POST", 368 reply = SynchronousRestFormsRequester.MakeRequest("POST",
367 m_ServerURI + "/grid", 369 uri,
368 ServerUtils.BuildQueryString(sendData)); 370 ServerUtils.BuildQueryString(sendData));
369 } 371 }
370 catch (Exception e) 372 catch (Exception e)
371 { 373 {
372 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 374 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
373 return rinfos; 375 return rinfos;
374 } 376 }
375 377
@@ -413,17 +415,19 @@ namespace OpenSim.Services.Connectors
413 415
414 List<GridRegion> rinfos = new List<GridRegion>(); 416 List<GridRegion> rinfos = new List<GridRegion>();
415 string reply = string.Empty; 417 string reply = string.Empty;
418 string uri = m_ServerURI + "/grid";
419
416 try 420 try
417 { 421 {
418 reply = SynchronousRestFormsRequester.MakeRequest("POST", 422 reply = SynchronousRestFormsRequester.MakeRequest("POST",
419 m_ServerURI + "/grid", 423 uri,
420 ServerUtils.BuildQueryString(sendData)); 424 ServerUtils.BuildQueryString(sendData));
421 425
422 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply); 426 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
423 } 427 }
424 catch (Exception e) 428 catch (Exception e)
425 { 429 {
426 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 430 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
427 return rinfos; 431 return rinfos;
428 } 432 }
429 433
@@ -463,17 +467,18 @@ namespace OpenSim.Services.Connectors
463 467
464 List<GridRegion> rinfos = new List<GridRegion>(); 468 List<GridRegion> rinfos = new List<GridRegion>();
465 string reply = string.Empty; 469 string reply = string.Empty;
470 string uri = m_ServerURI + "/grid";
466 try 471 try
467 { 472 {
468 reply = SynchronousRestFormsRequester.MakeRequest("POST", 473 reply = SynchronousRestFormsRequester.MakeRequest("POST",
469 m_ServerURI + "/grid", 474 uri,
470 ServerUtils.BuildQueryString(sendData)); 475 ServerUtils.BuildQueryString(sendData));
471 476
472 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply); 477 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
473 } 478 }
474 catch (Exception e) 479 catch (Exception e)
475 { 480 {
476 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 481 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
477 return rinfos; 482 return rinfos;
478 } 483 }
479 484
@@ -515,17 +520,18 @@ namespace OpenSim.Services.Connectors
515 520
516 List<GridRegion> rinfos = new List<GridRegion>(); 521 List<GridRegion> rinfos = new List<GridRegion>();
517 string reply = string.Empty; 522 string reply = string.Empty;
523 string uri = m_ServerURI + "/grid";
518 try 524 try
519 { 525 {
520 reply = SynchronousRestFormsRequester.MakeRequest("POST", 526 reply = SynchronousRestFormsRequester.MakeRequest("POST",
521 m_ServerURI + "/grid", 527 uri,
522 ServerUtils.BuildQueryString(sendData)); 528 ServerUtils.BuildQueryString(sendData));
523 529
524 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply); 530 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
525 } 531 }
526 catch (Exception e) 532 catch (Exception e)
527 { 533 {
528 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 534 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
529 return rinfos; 535 return rinfos;
530 } 536 }
531 537
@@ -565,17 +571,18 @@ namespace OpenSim.Services.Connectors
565 571
566 List<GridRegion> rinfos = new List<GridRegion>(); 572 List<GridRegion> rinfos = new List<GridRegion>();
567 string reply = string.Empty; 573 string reply = string.Empty;
574 string uri = m_ServerURI + "/grid";
568 try 575 try
569 { 576 {
570 reply = SynchronousRestFormsRequester.MakeRequest("POST", 577 reply = SynchronousRestFormsRequester.MakeRequest("POST",
571 m_ServerURI + "/grid", 578 uri,
572 ServerUtils.BuildQueryString(sendData)); 579 ServerUtils.BuildQueryString(sendData));
573 580
574 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply); 581 //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
575 } 582 }
576 catch (Exception e) 583 catch (Exception e)
577 { 584 {
578 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 585 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
579 return rinfos; 586 return rinfos;
580 } 587 }
581 588
@@ -615,15 +622,16 @@ namespace OpenSim.Services.Connectors
615 sendData["METHOD"] = "get_region_flags"; 622 sendData["METHOD"] = "get_region_flags";
616 623
617 string reply = string.Empty; 624 string reply = string.Empty;
625 string uri = m_ServerURI + "/grid";
618 try 626 try
619 { 627 {
620 reply = SynchronousRestFormsRequester.MakeRequest("POST", 628 reply = SynchronousRestFormsRequester.MakeRequest("POST",
621 m_ServerURI + "/grid", 629 uri,
622 ServerUtils.BuildQueryString(sendData)); 630 ServerUtils.BuildQueryString(sendData));
623 } 631 }
624 catch (Exception e) 632 catch (Exception e)
625 { 633 {
626 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 634 m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
627 return -1; 635 return -1;
628 } 636 }
629 637
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
index aa98b5d..20d7eaf 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServiceConnector.cs
@@ -156,11 +156,12 @@ namespace OpenSim.Services.Connectors
156 sendData["LookAt"] = lookAt.ToString(); 156 sendData["LookAt"] = lookAt.ToString();
157 157
158 string reqString = ServerUtils.BuildQueryString(sendData); 158 string reqString = ServerUtils.BuildQueryString(sendData);
159 string uri = m_ServerURI + "/griduser";
159 // m_log.DebugFormat("[GRID USER CONNECTOR]: queryString = {0}", reqString); 160 // m_log.DebugFormat("[GRID USER CONNECTOR]: queryString = {0}", reqString);
160 try 161 try
161 { 162 {
162 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 163 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
163 m_ServerURI + "/griduser", 164 uri,
164 reqString); 165 reqString);
165 if (reply != string.Empty) 166 if (reply != string.Empty)
166 { 167 {
@@ -182,7 +183,7 @@ namespace OpenSim.Services.Connectors
182 } 183 }
183 catch (Exception e) 184 catch (Exception e)
184 { 185 {
185 m_log.DebugFormat("[GRID USER CONNECTOR]: Exception when contacting grid user server: {0}", e.Message); 186 m_log.DebugFormat("[GRID USER CONNECTOR]: Exception when contacting grid user server at {0}: {1}", uri, e.Message);
186 } 187 }
187 188
188 return false; 189 return false;
@@ -191,11 +192,12 @@ namespace OpenSim.Services.Connectors
191 protected GridUserInfo Get(Dictionary<string, object> sendData) 192 protected GridUserInfo Get(Dictionary<string, object> sendData)
192 { 193 {
193 string reqString = ServerUtils.BuildQueryString(sendData); 194 string reqString = ServerUtils.BuildQueryString(sendData);
195 string uri = m_ServerURI + "/griduser";
194 // m_log.DebugFormat("[GRID USER CONNECTOR]: queryString = {0}", reqString); 196 // m_log.DebugFormat("[GRID USER CONNECTOR]: queryString = {0}", reqString);
195 try 197 try
196 { 198 {
197 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 199 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
198 m_ServerURI + "/griduser", 200 uri,
199 reqString); 201 reqString);
200 if (reply != string.Empty) 202 if (reply != string.Empty)
201 { 203 {
@@ -216,7 +218,7 @@ namespace OpenSim.Services.Connectors
216 } 218 }
217 catch (Exception e) 219 catch (Exception e)
218 { 220 {
219 m_log.DebugFormat("[GRID USER CONNECTOR]: Exception when contacting grid user server: {0}", e.Message); 221 m_log.DebugFormat("[GRID USER CONNECTOR]: Exception when contacting grid user server at {0}: {1}", uri, e.Message);
220 } 222 }
221 223
222 return null; 224 return null;
@@ -235,11 +237,12 @@ namespace OpenSim.Services.Connectors
235 237
236 string reply = string.Empty; 238 string reply = string.Empty;
237 string reqString = ServerUtils.BuildQueryString(sendData); 239 string reqString = ServerUtils.BuildQueryString(sendData);
240 string uri = m_ServerURI + "/griduser";
238 //m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString); 241 //m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
239 try 242 try
240 { 243 {
241 reply = SynchronousRestFormsRequester.MakeRequest("POST", 244 reply = SynchronousRestFormsRequester.MakeRequest("POST",
242 m_ServerURI + "/griduser", 245 uri,
243 reqString); 246 reqString);
244 if (reply == null || (reply != null && reply == string.Empty)) 247 if (reply == null || (reply != null && reply == string.Empty))
245 { 248 {
@@ -249,7 +252,7 @@ namespace OpenSim.Services.Connectors
249 } 252 }
250 catch (Exception e) 253 catch (Exception e)
251 { 254 {
252 m_log.DebugFormat("[GRID USER CONNECTOR]: Exception when contacting grid user server: {0}", e.Message); 255 m_log.DebugFormat("[GRID USER CONNECTOR]: Exception when contacting grid user server at {0}: {1}", uri, e.Message);
253 } 256 }
254 257
255 List<GridUserInfo> rinfos = new List<GridUserInfo>(); 258 List<GridUserInfo> rinfos = new List<GridUserInfo>();
diff --git a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs
index d699f59..af4b0da 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServiceConnector.cs
@@ -79,11 +79,12 @@ namespace OpenSim.Services.Connectors.Hypergrid
79 sendData["SESSIONID"] = m_SessionID.ToString(); 79 sendData["SESSIONID"] = m_SessionID.ToString();
80 80
81 string reqString = ServerUtils.BuildQueryString(sendData); 81 string reqString = ServerUtils.BuildQueryString(sendData);
82 string uri = m_ServerURI + "/hgfriends";
82 83
83 try 84 try
84 { 85 {
85 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 86 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
86 m_ServerURI + "/hgfriends", 87 uri,
87 reqString); 88 reqString);
88 if (reply != string.Empty) 89 if (reply != string.Empty)
89 { 90 {
@@ -103,7 +104,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
103 } 104 }
104 catch (Exception e) 105 catch (Exception e)
105 { 106 {
106 m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); 107 m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message);
107 } 108 }
108 109
109 return 0; 110 return 0;
@@ -123,15 +124,16 @@ namespace OpenSim.Services.Connectors.Hypergrid
123 sendData["SESSIONID"] = m_SessionID.ToString(); 124 sendData["SESSIONID"] = m_SessionID.ToString();
124 125
125 string reply = string.Empty; 126 string reply = string.Empty;
127 string uri = m_ServerURI + "/hgfriends";
126 try 128 try
127 { 129 {
128 reply = SynchronousRestFormsRequester.MakeRequest("POST", 130 reply = SynchronousRestFormsRequester.MakeRequest("POST",
129 m_ServerURI + "/hgfriends", 131 uri,
130 ServerUtils.BuildQueryString(sendData)); 132 ServerUtils.BuildQueryString(sendData));
131 } 133 }
132 catch (Exception e) 134 catch (Exception e)
133 { 135 {
134 m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); 136 m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message);
135 return false; 137 return false;
136 } 138 }
137 139
@@ -168,15 +170,16 @@ namespace OpenSim.Services.Connectors.Hypergrid
168 sendData["SECRET"] = secret; 170 sendData["SECRET"] = secret;
169 171
170 string reply = string.Empty; 172 string reply = string.Empty;
173 string uri = m_ServerURI + "/hgfriends";
171 try 174 try
172 { 175 {
173 reply = SynchronousRestFormsRequester.MakeRequest("POST", 176 reply = SynchronousRestFormsRequester.MakeRequest("POST",
174 m_ServerURI + "/hgfriends", 177 uri,
175 ServerUtils.BuildQueryString(sendData)); 178 ServerUtils.BuildQueryString(sendData));
176 } 179 }
177 catch (Exception e) 180 catch (Exception e)
178 { 181 {
179 m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); 182 m_log.DebugFormat("[HGFRIENDS CONNECTOR]: Exception when contacting friends server at {0}: {1}", uri, e.Message);
180 return false; 183 return false;
181 } 184 }
182 185
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
index e46714e..30bfb70 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
@@ -97,11 +97,12 @@ namespace OpenSim.Services.Connectors
97 sendData["DATA"] = Convert.ToBase64String(jpgData); 97 sendData["DATA"] = Convert.ToBase64String(jpgData);
98 98
99 string reqString = ServerUtils.BuildQueryString(sendData); 99 string reqString = ServerUtils.BuildQueryString(sendData);
100 string uri = m_ServerURI + "/map";
100 101
101 try 102 try
102 { 103 {
103 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 104 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
104 m_ServerURI + "/map", 105 uri,
105 reqString); 106 reqString);
106 if (reply != string.Empty) 107 if (reply != string.Empty)
107 { 108 {
@@ -135,7 +136,7 @@ namespace OpenSim.Services.Connectors
135 } 136 }
136 catch (Exception e) 137 catch (Exception e)
137 { 138 {
138 m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Exception when contacting grid server: {0}", e.Message); 139 m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Exception when contacting map server at {0}: {1}", uri, e.Message);
139 } 140 }
140 finally 141 finally
141 { 142 {
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
index 7238afc..f7d8c53 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
@@ -98,11 +98,12 @@ namespace OpenSim.Services.Connectors
98 sendData["SecureSessionID"] = secureSessionID.ToString(); 98 sendData["SecureSessionID"] = secureSessionID.ToString();
99 99
100 string reqString = ServerUtils.BuildQueryString(sendData); 100 string reqString = ServerUtils.BuildQueryString(sendData);
101 string uri = m_ServerURI + "/presence";
101 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString); 102 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
102 try 103 try
103 { 104 {
104 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 105 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
105 m_ServerURI + "/presence", 106 uri,
106 reqString); 107 reqString);
107 if (reply != string.Empty) 108 if (reply != string.Empty)
108 { 109 {
@@ -124,7 +125,7 @@ namespace OpenSim.Services.Connectors
124 } 125 }
125 catch (Exception e) 126 catch (Exception e)
126 { 127 {
127 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message); 128 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
128 } 129 }
129 130
130 return false; 131 return false;
@@ -142,11 +143,12 @@ namespace OpenSim.Services.Connectors
142 sendData["SessionID"] = sessionID.ToString(); 143 sendData["SessionID"] = sessionID.ToString();
143 144
144 string reqString = ServerUtils.BuildQueryString(sendData); 145 string reqString = ServerUtils.BuildQueryString(sendData);
146 string uri = m_ServerURI + "/presence";
145 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString); 147 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
146 try 148 try
147 { 149 {
148 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 150 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
149 m_ServerURI + "/presence", 151 uri,
150 reqString); 152 reqString);
151 if (reply != string.Empty) 153 if (reply != string.Empty)
152 { 154 {
@@ -168,7 +170,7 @@ namespace OpenSim.Services.Connectors
168 } 170 }
169 catch (Exception e) 171 catch (Exception e)
170 { 172 {
171 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message); 173 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
172 } 174 }
173 175
174 return false; 176 return false;
@@ -185,11 +187,12 @@ namespace OpenSim.Services.Connectors
185 sendData["RegionID"] = regionID.ToString(); 187 sendData["RegionID"] = regionID.ToString();
186 188
187 string reqString = ServerUtils.BuildQueryString(sendData); 189 string reqString = ServerUtils.BuildQueryString(sendData);
190 string uri = m_ServerURI + "/presence";
188 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString); 191 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
189 try 192 try
190 { 193 {
191 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 194 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
192 m_ServerURI + "/presence", 195 uri,
193 reqString); 196 reqString);
194 if (reply != string.Empty) 197 if (reply != string.Empty)
195 { 198 {
@@ -211,7 +214,7 @@ namespace OpenSim.Services.Connectors
211 } 214 }
212 catch (Exception e) 215 catch (Exception e)
213 { 216 {
214 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message); 217 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
215 } 218 }
216 219
217 return false; 220 return false;
@@ -229,11 +232,12 @@ namespace OpenSim.Services.Connectors
229 sendData["RegionID"] = regionID.ToString(); 232 sendData["RegionID"] = regionID.ToString();
230 233
231 string reqString = ServerUtils.BuildQueryString(sendData); 234 string reqString = ServerUtils.BuildQueryString(sendData);
235 string uri = m_ServerURI + "/presence";
232 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString); 236 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
233 try 237 try
234 { 238 {
235 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 239 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
236 m_ServerURI + "/presence", 240 uri,
237 reqString); 241 reqString);
238 if (reply != string.Empty) 242 if (reply != string.Empty)
239 { 243 {
@@ -255,7 +259,7 @@ namespace OpenSim.Services.Connectors
255 } 259 }
256 catch (Exception e) 260 catch (Exception e)
257 { 261 {
258 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message); 262 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
259 } 263 }
260 264
261 return false; 265 return false;
@@ -273,11 +277,12 @@ namespace OpenSim.Services.Connectors
273 277
274 string reply = string.Empty; 278 string reply = string.Empty;
275 string reqString = ServerUtils.BuildQueryString(sendData); 279 string reqString = ServerUtils.BuildQueryString(sendData);
280 string uri = m_ServerURI + "/presence";
276 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString); 281 // m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
277 try 282 try
278 { 283 {
279 reply = SynchronousRestFormsRequester.MakeRequest("POST", 284 reply = SynchronousRestFormsRequester.MakeRequest("POST",
280 m_ServerURI + "/presence", 285 uri,
281 reqString); 286 reqString);
282 if (reply == null || (reply != null && reply == string.Empty)) 287 if (reply == null || (reply != null && reply == string.Empty))
283 { 288 {
@@ -287,7 +292,7 @@ namespace OpenSim.Services.Connectors
287 } 292 }
288 catch (Exception e) 293 catch (Exception e)
289 { 294 {
290 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message); 295 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
291 } 296 }
292 297
293 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 298 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -316,11 +321,12 @@ namespace OpenSim.Services.Connectors
316 321
317 string reply = string.Empty; 322 string reply = string.Empty;
318 string reqString = ServerUtils.BuildQueryString(sendData); 323 string reqString = ServerUtils.BuildQueryString(sendData);
324 string uri = m_ServerURI + "/presence";
319 //m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString); 325 //m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
320 try 326 try
321 { 327 {
322 reply = SynchronousRestFormsRequester.MakeRequest("POST", 328 reply = SynchronousRestFormsRequester.MakeRequest("POST",
323 m_ServerURI + "/presence", 329 uri,
324 reqString); 330 reqString);
325 if (reply == null || (reply != null && reply == string.Empty)) 331 if (reply == null || (reply != null && reply == string.Empty))
326 { 332 {
@@ -330,7 +336,7 @@ namespace OpenSim.Services.Connectors
330 } 336 }
331 catch (Exception e) 337 catch (Exception e)
332 { 338 {
333 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message); 339 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
334 } 340 }
335 341
336 List<PresenceInfo> rinfos = new List<PresenceInfo>(); 342 List<PresenceInfo> rinfos = new List<PresenceInfo>();
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
index f6835b9..609dafe 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
@@ -138,11 +138,12 @@ namespace OpenSim.Services.Connectors
138 138
139 string reply = string.Empty; 139 string reply = string.Empty;
140 string reqString = ServerUtils.BuildQueryString(sendData); 140 string reqString = ServerUtils.BuildQueryString(sendData);
141 string uri = m_ServerURI + "/accounts";
141 // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString); 142 // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
142 try 143 try
143 { 144 {
144 reply = SynchronousRestFormsRequester.MakeRequest("POST", 145 reply = SynchronousRestFormsRequester.MakeRequest("POST",
145 m_ServerURI + "/accounts", 146 uri,
146 reqString); 147 reqString);
147 if (reply == null || (reply != null && reply == string.Empty)) 148 if (reply == null || (reply != null && reply == string.Empty))
148 { 149 {
@@ -152,7 +153,7 @@ namespace OpenSim.Services.Connectors
152 } 153 }
153 catch (Exception e) 154 catch (Exception e)
154 { 155 {
155 m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting accounts server: {0}", e.Message); 156 m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user accounts server at {0}: {1}", uri, e.Message);
156 } 157 }
157 158
158 List<UserAccount> accounts = new List<UserAccount>(); 159 List<UserAccount> accounts = new List<UserAccount>();
@@ -206,11 +207,12 @@ namespace OpenSim.Services.Connectors
206 { 207 {
207 string reply = string.Empty; 208 string reply = string.Empty;
208 string reqString = ServerUtils.BuildQueryString(sendData); 209 string reqString = ServerUtils.BuildQueryString(sendData);
210 string uri = m_ServerURI + "/accounts";
209 // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString); 211 // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
210 try 212 try
211 { 213 {
212 reply = SynchronousRestFormsRequester.MakeRequest("POST", 214 reply = SynchronousRestFormsRequester.MakeRequest("POST",
213 m_ServerURI + "/accounts", 215 uri,
214 reqString); 216 reqString);
215 if (reply == null || (reply != null && reply == string.Empty)) 217 if (reply == null || (reply != null && reply == string.Empty))
216 { 218 {
@@ -220,7 +222,7 @@ namespace OpenSim.Services.Connectors
220 } 222 }
221 catch (Exception e) 223 catch (Exception e)
222 { 224 {
223 m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user account server: {0}", e.Message); 225 m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user accounts server at {0}: {1}", uri, e.Message);
224 } 226 }
225 227
226 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 228 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -241,11 +243,12 @@ namespace OpenSim.Services.Connectors
241 private bool SendAndGetBoolReply(Dictionary<string, object> sendData) 243 private bool SendAndGetBoolReply(Dictionary<string, object> sendData)
242 { 244 {
243 string reqString = ServerUtils.BuildQueryString(sendData); 245 string reqString = ServerUtils.BuildQueryString(sendData);
246 string uri = m_ServerURI + "/accounts";
244 // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString); 247 // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: queryString = {0}", reqString);
245 try 248 try
246 { 249 {
247 string reply = SynchronousRestFormsRequester.MakeRequest("POST", 250 string reply = SynchronousRestFormsRequester.MakeRequest("POST",
248 m_ServerURI + "/accounts", 251 uri,
249 reqString); 252 reqString);
250 if (reply != string.Empty) 253 if (reply != string.Empty)
251 { 254 {
@@ -267,7 +270,7 @@ namespace OpenSim.Services.Connectors
267 } 270 }
268 catch (Exception e) 271 catch (Exception e)
269 { 272 {
270 m_log.DebugFormat("[ACCOUNTS CONNECTOR]: Exception when contacting user account server: {0}", e.Message); 273 m_log.DebugFormat("[ACCOUNT CONNECTOR]: Exception when contacting user accounts server at {0}: {1}", uri, e.Message);
271 } 274 }
272 275
273 return false; 276 return false;