aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2012-02-07 23:30:48 +0000
committerMelanie2012-02-07 23:30:48 +0000
commit236e1c45f2f484aa97d5faae149dbc304608f592 (patch)
treef6bcc2b3ceae99a7789a5dc22e5fecfcfe8505e2 /OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentSet UseMeshiesPhysicsMesh = true in [Mesh] by default (diff)
downloadopensim-SC-236e1c45f2f484aa97d5faae149dbc304608f592.zip
opensim-SC-236e1c45f2f484aa97d5faae149dbc304608f592.tar.gz
opensim-SC-236e1c45f2f484aa97d5faae149dbc304608f592.tar.bz2
opensim-SC-236e1c45f2f484aa97d5faae149dbc304608f592.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs30
1 files changed, 18 insertions, 12 deletions
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServiceConnector.cs
index e16dc36..378aab6 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);
@@ -327,11 +332,12 @@ namespace OpenSim.Services.Connectors
327 332
328 string reply = string.Empty; 333 string reply = string.Empty;
329 string reqString = ServerUtils.BuildQueryString(sendData); 334 string reqString = ServerUtils.BuildQueryString(sendData);
335 string uri = m_ServerURI + "/presence";
330 //m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString); 336 //m_log.DebugFormat("[PRESENCE CONNECTOR]: queryString = {0}", reqString);
331 try 337 try
332 { 338 {
333 reply = SynchronousRestFormsRequester.MakeRequest("POST", 339 reply = SynchronousRestFormsRequester.MakeRequest("POST",
334 m_ServerURI + "/presence", 340 uri,
335 reqString); 341 reqString);
336 if (reply == null || (reply != null && reply == string.Empty)) 342 if (reply == null || (reply != null && reply == string.Empty))
337 { 343 {
@@ -341,7 +347,7 @@ namespace OpenSim.Services.Connectors
341 } 347 }
342 catch (Exception e) 348 catch (Exception e)
343 { 349 {
344 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server: {0}", e.Message); 350 m_log.DebugFormat("[PRESENCE CONNECTOR]: Exception when contacting presence server at {0}: {1}", uri, e.Message);
345 } 351 }
346 352
347 List<PresenceInfo> rinfos = new List<PresenceInfo>(); 353 List<PresenceInfo> rinfos = new List<PresenceInfo>();