2 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index e3ad52a..d63ac2e 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Grid.GridServer
         protected GridConfig m_config;
         public string m_consoleType = "local";
         public IConfigSource m_configSource = null;
+        public string m_configFile = "GridServer_Config.xml";
 
         public GridConfig Config
         {
@@ -91,7 +92,7 @@ namespace OpenSim.Grid.GridServer
                 break;
             }
             MainConsole.Instance = m_console;
-            m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
+            m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), m_configFile)));
 
             m_log.Info("[GRID]: Starting HTTP process");
             m_httpServer = new BaseHttpServer(m_config.HttpPort);
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index c7ba897..741a01b 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Grid.GridServer
         {
             ArgvConfigSource argvSource = new ArgvConfigSource(args);
             argvSource.AddSwitch("Startup", "console", "c");
+            argvSource.AddSwitch("Startup", "xmlfile", "x");
 
             XmlConfigurator.Configure();
 
@@ -45,6 +46,7 @@ namespace OpenSim.Grid.GridServer
             if (startupConfig != null)
             {
                 app.m_consoleType = startupConfig.GetString("console", "local");
+                app.m_configFile = startupConfig.GetString("xmlfile", "GridServer_Config.xml");
             }
 
             app.m_configSource = argvSource;