From feca5d22c68230bd0c87a288d9671c15dcd67956 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Fri, 27 Apr 2007 20:32:02 +0000
Subject: * Added new commandline option -config <configfile.xml>

Note: This is untested but is a very simple change and should 'just work'. If someone can test, appreciated.

---
 OpenSim.RegionServer/OpenSimMain.cs |  5 +++--
 OpenSim/Application.cs              | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 4375f74..20fffc8 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -87,10 +87,11 @@ namespace OpenSim
         public bool user_accounts = false;
         public bool gridLocalAsset = false;
         private bool configFileSetup = false;
+        public string m_config;
 
         protected ConsoleBase m_console;
 
-        public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool verbose)
+        public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool verbose, string configFile)
         {
             this.configFileSetup = useConfigFile;
             m_sandbox = sandBoxMode;
@@ -109,7 +110,7 @@ namespace OpenSim
             this.regionData = new RegionInfo();
             try
             {
-                this.localConfig = new XmlConfig("simconfig.xml");
+                this.localConfig = new XmlConfig(m_config);
                 this.localConfig.LoadData();
             }
             catch (Exception e)
diff --git a/OpenSim/Application.cs b/OpenSim/Application.cs
index 6adc540..7d8be59 100644
--- a/OpenSim/Application.cs
+++ b/OpenSim/Application.cs
@@ -22,6 +22,7 @@ namespace OpenSim
             bool gridLocalAsset = false;
             bool useConfigFile = false;
             bool noverbose = false;
+            string configFile = "simconfig.xml";
             
             for (int i = 0; i < args.Length; i++)
             {
@@ -60,9 +61,21 @@ namespace OpenSim
                 {
                     noverbose = true;
                 }
+                if (args[i] == "-config")
+                {
+                    try
+                    {
+                        i++;
+                        configFile = args[i];
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine("-config: Please specify a config file.");
+                    }
+                }
             }
 
-            OpenSimMain sim = new OpenSimMain( sandBoxMode, startLoginServer, physicsEngine, useConfigFile, noverbose);
+            OpenSimMain sim = new OpenSimMain(sandBoxMode, startLoginServer, physicsEngine, useConfigFile, noverbose, configFile);
            // OpenSimRoot.Instance.Application = sim;
             sim.m_sandbox = sandBoxMode;
             sim.user_accounts = userAccounts;
-- 
cgit v1.1