OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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
0.6.0-stable
Justin Clarke Casey 2008-10-29 18:53:24 +00:00
parent 8a3157aa6a
commit b21734d4d9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
View File

@ -96,7 +96,8 @@ namespace OpenSim.Region.DataSnapshot
public void Initialise(Scene scene, IConfigSource config) public void Initialise(Scene scene, IConfigSource config)
{ {
if (!m_configLoaded) { if (!m_configLoaded)
{
m_configLoaded = true; m_configLoaded = true;
m_log.Info("[DATASNAPSHOT]: Loading configuration"); m_log.Info("[DATASNAPSHOT]: Loading configuration");
//Read from the config for options //Read from the config for options
@ -111,10 +112,6 @@ namespace OpenSim.Region.DataSnapshot
m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl")); m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl"));
m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl")); m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
} }
else
{
//Non gridmode stuff
}
m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl")); m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level); m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level);
@ -205,9 +202,8 @@ namespace OpenSim.Region.DataSnapshot
public void Close() public void Close()
{ {
if (m_dataServices != "" && m_dataServices != "noservices") if (m_enabled && m_dataServices != "" && m_dataServices != "noservices")
NotifyDataServices(m_dataServices, "offline"); NotifyDataServices(m_dataServices, "offline");
} }