From f5ec332474ef5b7ee8e2588a1783f756f0a64525 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 6 May 2011 22:41:07 +0100
Subject: remove obsolete [StandAlone] config section parsing, none of which
 was actually used since being superseded by the connector architecture in 0.7

---
 OpenSim/Framework/ConfigSettings.cs               | 50 +----------------------
 OpenSim/Region/Application/ConfigurationLoader.cs | 16 +-------
 2 files changed, 2 insertions(+), 64 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index be77341..9114e00 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -76,54 +76,6 @@ namespace OpenSim.Framework
             set { m_physicalPrim = value; }
         }
 
-        private bool m_standaloneAuthenticate = false;
-
-        public bool StandaloneAuthenticate
-        {
-            get { return m_standaloneAuthenticate; }
-            set { m_standaloneAuthenticate = value; }
-        }
-
-        private string m_standaloneWelcomeMessage = null;
-
-        public string StandaloneWelcomeMessage
-        {
-            get { return m_standaloneWelcomeMessage; }
-            set { m_standaloneWelcomeMessage = value; }
-        }
-
-        private string m_standaloneInventoryPlugin;
-
-        public string StandaloneInventoryPlugin
-        {
-            get { return m_standaloneInventoryPlugin; }
-            set { m_standaloneInventoryPlugin = value; }
-        }
-
-        private string m_standaloneUserPlugin;
-
-        public string StandaloneUserPlugin
-        {
-            get { return m_standaloneUserPlugin; }
-            set { m_standaloneUserPlugin = value; }
-        }
-
-        private string m_standaloneInventorySource;
-
-        public string StandaloneInventorySource
-        {
-            get { return m_standaloneInventorySource; }
-            set { m_standaloneInventorySource = value; }
-        }
-
-        private string m_standaloneUserSource;
-
-        public string StandaloneUserSource
-        {
-            get { return m_standaloneUserSource; }
-            set { m_standaloneUserSource = value; }
-        }
-
         protected string m_librariesXMLFile;
         public string LibrariesXMLFile
         {
@@ -146,4 +98,4 @@ namespace OpenSim.Framework
         public const uint DefaultGridServerHttpPort = 8003;
         public const uint DefaultInventoryServerHttpPort = 8003;
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 40ab765..2d81ea8 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -372,21 +372,7 @@ namespace OpenSim
                     = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
             }
 
-            IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
-            if (standaloneConfig != null)
-            {
-                m_configSettings.StandaloneAuthenticate = standaloneConfig.GetBoolean("accounts_authenticate", true);
-                m_configSettings.StandaloneWelcomeMessage = standaloneConfig.GetString("welcome_message");
-
-                m_configSettings.StandaloneInventoryPlugin = standaloneConfig.GetString("inventory_plugin");
-                m_configSettings.StandaloneInventorySource = standaloneConfig.GetString("inventory_source");
-                m_configSettings.StandaloneUserPlugin = standaloneConfig.GetString("userDatabase_plugin");
-                m_configSettings.StandaloneUserSource = standaloneConfig.GetString("user_source");
-
-                m_configSettings.LibrariesXMLFile = standaloneConfig.GetString("LibrariesXMLFile");
-            }
-
             m_networkServersInfo.loadFromConfiguration(m_config.Source);
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1