OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a path issue i caused in a prior commit

0.6.0-stable
Melanie Thielker 2008-10-11 20:23:54 +00:00
parent 143419ebb2
commit 8bc724a418
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -160,14 +160,11 @@ namespace OpenSim
IConfig startupConfig = configSource.Configs["Startup"]; IConfig startupConfig = configSource.Configs["Startup"];
string iniFileName = startupConfig.GetString("inifile", "OpenSim.ini"); string iniFileName = startupConfig.GetString("inifile", "OpenSim.ini");
if (!iniFileName.StartsWith("/") && !iniFileName.StartsWith("\\")) Application.iniFilePath = Path.Combine(Util.configDir(), iniFileName);
Application.iniFilePath = Path.Combine(Util.configDir(), iniFileName);
string masterFileName = startupConfig.GetString("inimaster", ""); string masterFileName = startupConfig.GetString("inimaster", "");
string masterfilePath = masterFileName; string masterfilePath = Path.Combine(Util.configDir(), masterFileName);
if (!masterFileName.StartsWith("/") && !masterFileName.StartsWith("\\") && masterFileName != "")
masterfilePath = Path.Combine(Util.configDir(), masterfilePath);
m_config = new OpenSimConfigSource(); m_config = new OpenSimConfigSource();
m_config.Source = new IniConfigSource(); m_config.Source = new IniConfigSource();