aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-29 00:10:59 +0000
committerMelanie Thielker2008-10-29 00:10:59 +0000
commit0c6db79a8eabf5117c00edaaa2434630c7d7c877 (patch)
treefe7b10d4d4e588ba0b2c307fa42b52650dd06534
parent* minor: remove mono compiler warnings (diff)
downloadopensim-SC_OLD-0c6db79a8eabf5117c00edaaa2434630c7d7c877.zip
opensim-SC_OLD-0c6db79a8eabf5117c00edaaa2434630c7d7c877.tar.gz
opensim-SC_OLD-0c6db79a8eabf5117c00edaaa2434630c7d7c877.tar.bz2
opensim-SC_OLD-0c6db79a8eabf5117c00edaaa2434630c7d7c877.tar.xz
Mantis #2489
Thank you, Diva, for a patch that helps keep the list of sims to index clean by allowing sims to deregister.
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs15
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 6af6574..bca67eb 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -94,8 +94,6 @@ namespace OpenSim.Region.DataSnapshot
94 94
95 #region IRegionModule 95 #region IRegionModule
96 96
97 public void Close() {}
98
99 public void Initialise(Scene scene, IConfigSource config) 97 public void Initialise(Scene scene, IConfigSource config)
100 { 98 {
101 if (!m_configLoaded) { 99 if (!m_configLoaded) {
@@ -162,7 +160,7 @@ namespace OpenSim.Region.DataSnapshot
162 MakeEverythingStale(); 160 MakeEverythingStale();
163 161
164 if (m_dataServices != "" && m_dataServices != "noservices") 162 if (m_dataServices != "" && m_dataServices != "noservices")
165 NotifyDataServices(m_dataServices); 163 NotifyDataServices(m_dataServices, "online");
166 } 164 }
167 } 165 }
168 166
@@ -205,6 +203,14 @@ namespace OpenSim.Region.DataSnapshot
205 } 203 }
206 } 204 }
207 205
206 public void Close()
207 {
208 if (m_dataServices != "" && m_dataServices != "noservices")
209 NotifyDataServices(m_dataServices, "offline");
210
211 }
212
213
208 public bool IsSharedModule 214 public bool IsSharedModule
209 { 215 {
210 get { return true; } 216 get { return true; }
@@ -313,7 +319,7 @@ namespace OpenSim.Region.DataSnapshot
313 #endregion 319 #endregion
314 320
315 #region External data services 321 #region External data services
316 private void NotifyDataServices(string servicesStr) 322 private void NotifyDataServices(string servicesStr, string serviceName)
317 { 323 {
318 Stream reply = null; 324 Stream reply = null;
319 string delimStr = ";"; 325 string delimStr = ";";
@@ -325,6 +331,7 @@ namespace OpenSim.Region.DataSnapshot
325 { 331 {
326 string url = services[i].Trim(); 332 string url = services[i].Trim();
327 RestClient cli = new RestClient(url); 333 RestClient cli = new RestClient(url);
334 cli.AddQueryParameter("service", serviceName);
328 cli.AddQueryParameter("host", m_hostname); 335 cli.AddQueryParameter("host", m_hostname);
329 cli.AddQueryParameter("port", m_listener_port); 336 cli.AddQueryParameter("port", m_listener_port);
330 cli.RequestMethod = "GET"; 337 cli.RequestMethod = "GET";