Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

1 files changed, 12 insertions, 0 deletions

diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 9618b85..c7ba897 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -26,6 +26,7 @@
  */
 
 using log4net.Config;
+using Nini.Config;
 
 namespace OpenSim.Grid.GridServer
 {
@@ -33,10 +34,21 @@ namespace OpenSim.Grid.GridServer
     {
         public static void Main(string[] args)
         {
+            ArgvConfigSource argvSource = new ArgvConfigSource(args);
+            argvSource.AddSwitch("Startup", "console", "c");
+
             XmlConfigurator.Configure();
 
             GridServerBase app = new GridServerBase();
 
+            IConfig startupConfig = argvSource.Configs["Startup"];
+            if (startupConfig != null)
+            {
+                app.m_consoleType = startupConfig.GetString("console", "local");
+            }
+
+            app.m_configSource = argvSource;
+
 //            if (args.Length > 0 && args[0] == "-setuponly")
 //            {
 //                app.Config();