From 09ab32c21e0974e85698d2d758495d99063dedf8 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 4 Aug 2010 03:23:19 +0200
Subject: Remove StandAlone from default hardcoded config

---
 OpenSim/Tools/Configger/ConfigurationLoader.cs | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'OpenSim/Tools/Configger')

diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 1619a22..3d1b668 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -242,21 +242,6 @@ namespace OpenSim.Tools.Configger
             }
 
             {
-                IConfig config = defaultConfig.Configs["StandAlone"];
-
-                if (null == config)
-                    config = defaultConfig.AddConfig("StandAlone");
-
-                config.Set("accounts_authenticate", true);
-                config.Set("welcome_message", "Welcome to OpenSimulator");
-                config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
-                config.Set("inventory_source", "");
-                config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
-                config.Set("user_source", "");
-                config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
-            }
-
-            {
                 IConfig config = defaultConfig.Configs["Network"];
 
                 if (null == config)
-- 
cgit v1.1


From 604ea5fa90a6e7817a09f8e27ea1c001d151a5ae Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 4 Aug 2010 03:53:51 +0100
Subject: remove more useless defaults

---
 OpenSim/Tools/Configger/ConfigurationLoader.cs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'OpenSim/Tools/Configger')

diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 3d1b668..f82eb58 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -249,11 +249,6 @@ namespace OpenSim.Tools.Configger
 
                 config.Set("default_location_x", 1000);
                 config.Set("default_location_y", 1000);
-                config.Set("grid_send_key", "null");
-                config.Set("grid_recv_key", "null");
-                config.Set("user_send_key", "null");
-                config.Set("user_recv_key", "null");
-                config.Set("secure_inventory_server", "true");
             }
 
             return defaultConfig;
-- 
cgit v1.1


From f72ab53699d40a0d3c4455293add2b7f189c2a4f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 4 Aug 2010 07:50:34 -0700
Subject: Removed a few more obsolete default configs.

---
 OpenSim/Tools/Configger/ConfigurationLoader.cs | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'OpenSim/Tools/Configger')

diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index f82eb58..e74debb 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -241,16 +241,6 @@ namespace OpenSim.Tools.Configger
                 config.Set("EventQueue", true);
             }
 
-            {
-                IConfig config = defaultConfig.Configs["Network"];
-
-                if (null == config)
-                    config = defaultConfig.AddConfig("Network");
-
-                config.Set("default_location_x", 1000);
-                config.Set("default_location_y", 1000);
-            }
-
             return defaultConfig;
         }
 
-- 
cgit v1.1