From 134f86e8d5c414409631b25b8c6f0ee45fbd8631 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 3 Nov 2016 21:44:39 +1000
Subject: Initial update to OpenSim 0.8.2.1 source code.

---
 OpenSim/Tools/Configger/ConfigurationLoader.cs     | 17 ++++++-----------
 OpenSim/Tools/Configger/Main.cs                    |  5 +++--
 OpenSim/Tools/Configger/Properties/AssemblyInfo.cs |  4 ++--
 3 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'OpenSim/Tools/Configger')

diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 28bcc99..f1d3649 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -64,14 +64,13 @@ namespace OpenSim.Tools.Configger
         /// <param name="configSettings"></param>
         /// <param name="networkInfo"></param>
         /// <returns>A configuration that gets passed to modules</returns>
-        public IConfigSource LoadConfigSettings()
+        public IConfigSource LoadConfigSettings(IConfig startupConfig)
         {
             bool iniFileExists = false;
 
             List<string> sources = new List<string>();
 
-            string iniFileName = "OpenSim.ini";
-            string iniFilePath = Path.Combine(".", iniFileName);
+            string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini"));
 
             if (IsUri(iniFileName))
             {
@@ -80,10 +79,10 @@ namespace OpenSim.Tools.Configger
             }
             else
             {
-                if (File.Exists(iniFilePath))
+                if (File.Exists(iniFileName))
                 {
-                    if (!sources.Contains(iniFilePath))
-                        sources.Add(iniFilePath);
+                    if (!sources.Contains(iniFileName))
+                        sources.Add(iniFileName);
                 }
             }
 
@@ -239,10 +238,7 @@ namespace OpenSim.Tools.Configger
                 config.Set("physics", "OpenDynamicsEngine");
                 config.Set("meshing", "Meshmerizer");
                 config.Set("physical_prim", true);
-                config.Set("see_into_this_sim_from_neighbor", true);
                 config.Set("serverside_object_permissions", true);
-                config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
-                config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
                 config.Set("storage_prim_inventories", true);
                 config.Set("startup_console_commands_file", String.Empty);
                 config.Set("shutdown_console_commands_file", String.Empty);
@@ -254,6 +250,5 @@ namespace OpenSim.Tools.Configger
 
             return defaultConfig;
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tools/Configger/Main.cs b/OpenSim/Tools/Configger/Main.cs
index 61a12e3..d7d918b 100644
--- a/OpenSim/Tools/Configger/Main.cs
+++ b/OpenSim/Tools/Configger/Main.cs
@@ -35,15 +35,16 @@ namespace OpenSim.Tools.Configger
         public static int Main(string[] args)
         {
             ArgvConfigSource argvConfig = new ArgvConfigSource(args);
+
             argvConfig.AddSwitch("Startup", "format", "f");
+            argvConfig.AddSwitch("Startup", "inifile");
 
             IConfig startupConfig = argvConfig.Configs["Startup"];
 
             string format = startupConfig.GetString("format", "ini");
 
             ConfigurationLoader loader = new ConfigurationLoader();
-
-            IConfigSource s = loader.LoadConfigSettings();
+            IConfigSource s = loader.LoadConfigSettings(startupConfig);
 
             if (format == "mysql")
             {
diff --git a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
index 62a2f2d..359d854 100644
--- a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.7.5.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.8.3.*")]
+
-- 
cgit v1.1