aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-09-01 14:54:35 +0100
committerUbitUmarov2015-09-01 14:54:35 +0100
commit371c9dd2af01a2e7422ec901ee1f80757284a78c (patch)
tree058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
parentremove lixo (diff)
parentdont change camera on crossings (diff)
downloadopensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip
opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz
opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2
opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz
bad merge?
Diffstat (limited to 'OpenSim/Region/DataSnapshot/DataSnapshotManager.cs')
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs23
1 files changed, 23 insertions, 0 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 600e826..7472050 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -402,6 +402,7 @@ namespace OpenSim.Region.DataSnapshot
402 string url = services[i].Trim(); 402 string url = services[i].Trim();
403 using (RestClient cli = new RestClient(url)) 403 using (RestClient cli = new RestClient(url))
404 { 404 {
405<<<<<<< HEAD
405 cli.AddQueryParameter("service", serviceName); 406 cli.AddQueryParameter("service", serviceName);
406 cli.AddQueryParameter("host", m_hostname); 407 cli.AddQueryParameter("host", m_hostname);
407 cli.AddQueryParameter("port", m_listener_port); 408 cli.AddQueryParameter("port", m_listener_port);
@@ -435,6 +436,28 @@ namespace OpenSim.Region.DataSnapshot
435 // string responseStr = Util.UTF8.GetString(response); 436 // string responseStr = Util.UTF8.GetString(response);
436 m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret); 437 m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
437 } 438 }
439=======
440 m_log.Warn("[DATASNAPSHOT]: Ignoring unknown exception " + e.ToString());
441 }
442
443 byte[] response = new byte[1024];
444 // int n = 0;
445 try
446 {
447 // n = reply.Read(response, 0, 1024);
448 reply.Read(response, 0, 1024);
449 }
450 catch (Exception e)
451 {
452 m_log.WarnFormat("[DATASNAPSHOT]: Unable to decode reply from data service. Ignoring. {0}", e.StackTrace);
453 }
454 // This is not quite working, so...
455 // string responseStr = Util.UTF8.GetString(response);
456 m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret);
457
458 if(reply != null)
459 reply.Close();
460>>>>>>> avn/ubitvar
438 } 461 }
439 462
440 } 463 }