aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/Program.cs
diff options
context:
space:
mode:
authorDiva Canto2009-08-21 11:01:23 -0700
committerDiva Canto2009-08-21 11:01:23 -0700
commitf9ee8be2bce8dd894f0db33f152c872695ac839d (patch)
treef3d09cb58ffe68ac95f9e4197435f4d837d00ded /OpenSim/Grid/GridServer/Program.cs
parentAdded a more sane InventoryServerMoveItemsHandler. Changed SynchronousRestObj... (diff)
parentFix Messaging server so -xmlfile actually works (diff)
downloadopensim-SC_OLD-f9ee8be2bce8dd894f0db33f152c872695ac839d.zip
opensim-SC_OLD-f9ee8be2bce8dd894f0db33f152c872695ac839d.tar.gz
opensim-SC_OLD-f9ee8be2bce8dd894f0db33f152c872695ac839d.tar.bz2
opensim-SC_OLD-f9ee8be2bce8dd894f0db33f152c872695ac839d.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Grid/GridServer/Program.cs')
-rw-r--r--OpenSim/Grid/GridServer/Program.cs2
1 files changed, 2 insertions, 0 deletions
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
36 { 36 {
37 ArgvConfigSource argvSource = new ArgvConfigSource(args); 37 ArgvConfigSource argvSource = new ArgvConfigSource(args);
38 argvSource.AddSwitch("Startup", "console", "c"); 38 argvSource.AddSwitch("Startup", "console", "c");
39 argvSource.AddSwitch("Startup", "xmlfile", "x");
39 40
40 XmlConfigurator.Configure(); 41 XmlConfigurator.Configure();
41 42
@@ -45,6 +46,7 @@ namespace OpenSim.Grid.GridServer
45 if (startupConfig != null) 46 if (startupConfig != null)
46 { 47 {
47 app.m_consoleType = startupConfig.GetString("console", "local"); 48 app.m_consoleType = startupConfig.GetString("console", "local");
49 app.m_configFile = startupConfig.GetString("xmlfile", "GridServer_Config.xml");
48 } 50 }
49 51
50 app.m_configSource = argvSource; 52 app.m_configSource = argvSource;