diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-26 11:48:05 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-26 11:48:05 -0400 |
| commit | 54e05a083d2aeb7a892647f64edfd52db80ce5ed (patch) | |
| tree | 1fca51f8dd19c0f4871d8e1b875511c6087b3675 /OpenSim/Grid/GridServer/GridServerBase.cs | |
| parent | * It turns out that Physics heightmap values were being stored in managed mem... (diff) | |
| parent | Add reference to OpenMetaverse.dll to UserServer.Modules to make MSVS happy (diff) | |
| download | opensim-SC-54e05a083d2aeb7a892647f64edfd52db80ce5ed.zip opensim-SC-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.gz opensim-SC-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.bz2 opensim-SC-54e05a083d2aeb7a892647f64edfd52db80ce5ed.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Grid/GridServer/GridServerBase.cs')
| -rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 3 |
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); |