From b21734d4d98606a994929adda6316c9e7a3037e9 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 29 Oct 2008 18:53:24 +0000
Subject: * 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

---
 OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'OpenSim')

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
 
         public void Initialise(Scene scene, IConfigSource config)
         {
-            if (!m_configLoaded) {
+            if (!m_configLoaded) 
+            {
                 m_configLoaded = true;
                 m_log.Info("[DATASNAPSHOT]: Loading configuration");
                 //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("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
                         }
-                        else
-                        {
-                            //Non gridmode stuff
-                        }
 
                         m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
                         m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level);
@@ -205,9 +202,8 @@ namespace OpenSim.Region.DataSnapshot
 
         public void Close() 
         {
-            if (m_dataServices != "" && m_dataServices != "noservices")
+            if (m_enabled && m_dataServices != "" && m_dataServices != "noservices")
                 NotifyDataServices(m_dataServices, "offline");
-
         }
 
 
-- 
cgit v1.1