diff options
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r-- | OpenSim.RegionServer/OpenSimMain.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs index 4375f74..20fffc8 100644 --- a/OpenSim.RegionServer/OpenSimMain.cs +++ b/OpenSim.RegionServer/OpenSimMain.cs | |||
@@ -87,10 +87,11 @@ namespace OpenSim | |||
87 | public bool user_accounts = false; | 87 | public bool user_accounts = false; |
88 | public bool gridLocalAsset = false; | 88 | public bool gridLocalAsset = false; |
89 | private bool configFileSetup = false; | 89 | private bool configFileSetup = false; |
90 | public string m_config; | ||
90 | 91 | ||
91 | protected ConsoleBase m_console; | 92 | protected ConsoleBase m_console; |
92 | 93 | ||
93 | public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool verbose) | 94 | public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool verbose, string configFile) |
94 | { | 95 | { |
95 | this.configFileSetup = useConfigFile; | 96 | this.configFileSetup = useConfigFile; |
96 | m_sandbox = sandBoxMode; | 97 | m_sandbox = sandBoxMode; |
@@ -109,7 +110,7 @@ namespace OpenSim | |||
109 | this.regionData = new RegionInfo(); | 110 | this.regionData = new RegionInfo(); |
110 | try | 111 | try |
111 | { | 112 | { |
112 | this.localConfig = new XmlConfig("simconfig.xml"); | 113 | this.localConfig = new XmlConfig(m_config); |
113 | this.localConfig.LoadData(); | 114 | this.localConfig.LoadData(); |
114 | } | 115 | } |
115 | catch (Exception e) | 116 | catch (Exception e) |