ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add -xmlfile= option to UGM, to let the files be outside bin if desired

Browse Source
This commit is contained in:
Melanie
2009-08-21 11:35:40 +01:00
parent 158ad39df0
commit 7daf6dbbd3
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Grid/GridServer/GridServerBase.cs
View File

@@ -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);

2
OpenSim/Grid/GridServer/Program.cs
View File

@@ -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;