From 8bc724a418038200af5ac6922c869b3cf6a9a882 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sat, 11 Oct 2008 20:23:54 +0000 Subject: [PATCH] Fix a path issue i caused in a prior commit --- OpenSim/Region/Application/OpenSimBase.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 8bd2537e70..7598e163fa 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -160,14 +160,11 @@ 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 iniFileName = startupConfig.GetString("inifile", "OpenSim.ini"); + 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 masterFileName = startupConfig.GetString("inimaster", ""); + string masterfilePath = Path.Combine(Util.configDir(), masterFileName); m_config = new OpenSimConfigSource(); m_config.Source = new IniConfigSource();