aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-29 18:53:24 +0000
committerJustin Clarke Casey2008-10-29 18:53:24 +0000
commitb21734d4d98606a994929adda6316c9e7a3037e9 (patch)
tree77e405edaa9bcabebba23c518b3b92663d3c36f6
parent* Check in (disabled) results of not persisting avatar textures but rather se... (diff)
downloadopensim-SC_OLD-b21734d4d98606a994929adda6316c9e7a3037e9.zip
opensim-SC_OLD-b21734d4d98606a994929adda6316c9e7a3037e9.tar.gz
opensim-SC_OLD-b21734d4d98606a994929adda6316c9e7a3037e9.tar.bz2
opensim-SC_OLD-b21734d4d98606a994929adda6316c9e7a3037e9.tar.xz
* Stop the DataSnapShot module trying to call home on shutdown even if it isn't enabled.
* Please let's check such patches carefully - we don't want info leaking out unless the user has requested it
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs10
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index bca67eb..3763dcd 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -96,7 +96,8 @@ namespace OpenSim.Region.DataSnapshot
96 96
97 public void Initialise(Scene scene, IConfigSource config) 97 public void Initialise(Scene scene, IConfigSource config)
98 { 98 {
99 if (!m_configLoaded) { 99 if (!m_configLoaded)
100 {
100 m_configLoaded = true; 101 m_configLoaded = true;
101 m_log.Info("[DATASNAPSHOT]: Loading configuration"); 102 m_log.Info("[DATASNAPSHOT]: Loading configuration");
102 //Read from the config for options 103 //Read from the config for options
@@ -111,10 +112,6 @@ namespace OpenSim.Region.DataSnapshot
111 m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl")); 112 m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl"));
112 m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl")); 113 m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
113 } 114 }
114 else
115 {
116 //Non gridmode stuff
117 }
118 115
119 m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl")); 116 m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
120 m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level); 117 m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level);
@@ -205,9 +202,8 @@ namespace OpenSim.Region.DataSnapshot
205 202
206 public void Close() 203 public void Close()
207 { 204 {
208 if (m_dataServices != "" && m_dataServices != "noservices") 205 if (m_enabled && m_dataServices != "" && m_dataServices != "noservices")
209 NotifyDataServices(m_dataServices, "offline"); 206 NotifyDataServices(m_dataServices, "offline");
210
211 } 207 }
212 208
213 209