aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/GridServerBase.cs
diff options
context:
space:
mode:
authorMelanie2009-08-21 11:35:40 +0100
committerMelanie2009-08-21 11:35:40 +0100
commit7daf6dbbd3ae70f43793c360bc3ab08efd89e850 (patch)
tree18a76a8f5000ede58c34044c3db35c7dd07d77a5 /OpenSim/Grid/GridServer/GridServerBase.cs
parentAdd copyright header. Formatting cleanup. (diff)
downloadopensim-SC_OLD-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.zip
opensim-SC_OLD-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.gz
opensim-SC_OLD-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.bz2
opensim-SC_OLD-7daf6dbbd3ae70f43793c360bc3ab08efd89e850.tar.xz
Add -xmlfile= option to UGM, to let the files be outside bin if desired
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs3
1 files changed, 2 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
49 protected GridConfig m_config; 49 protected GridConfig m_config;
50 public string m_consoleType = "local"; 50 public string m_consoleType = "local";
51 public IConfigSource m_configSource = null; 51 public IConfigSource m_configSource = null;
52 public string m_configFile = "GridServer_Config.xml";
52 53
53 public GridConfig Config 54 public GridConfig Config
54 { 55 {
@@ -91,7 +92,7 @@ namespace OpenSim.Grid.GridServer
91 break; 92 break;
92 } 93 }
93 MainConsole.Instance = m_console; 94 MainConsole.Instance = m_console;
94 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml"))); 95 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), m_configFile)));
95 96
96 m_log.Info("[GRID]: Starting HTTP process"); 97 m_log.Info("[GRID]: Starting HTTP process");
97 m_httpServer = new BaseHttpServer(m_config.HttpPort); 98 m_httpServer = new BaseHttpServer(m_config.HttpPort);