Fix a path issue i caused in a prior commit
parent
143419ebb2
commit
8bc724a418
|
@ -161,13 +161,10 @@ namespace OpenSim
|
|||
IConfig startupConfig = configSource.Configs["Startup"];
|
||||
|
||||
string iniFileName = startupConfig.GetString("inifile", "OpenSim.ini");
|
||||
if (!iniFileName.StartsWith("/") && !iniFileName.StartsWith("\\"))
|
||||
Application.iniFilePath = Path.Combine(Util.configDir(), iniFileName);
|
||||
|
||||
string masterFileName = startupConfig.GetString("inimaster", "");
|
||||
string masterfilePath = masterFileName;
|
||||
if (!masterFileName.StartsWith("/") && !masterFileName.StartsWith("\\") && masterFileName != "")
|
||||
masterfilePath = Path.Combine(Util.configDir(), masterfilePath);
|
||||
string masterfilePath = Path.Combine(Util.configDir(), masterFileName);
|
||||
|
||||
m_config = new OpenSimConfigSource();
|
||||
m_config.Source = new IniConfigSource();
|
||||
|
|
Loading…
Reference in New Issue