aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-11 20:23:54 +0000
committerMelanie Thielker2008-10-11 20:23:54 +0000
commit8bc724a418038200af5ac6922c869b3cf6a9a882 (patch)
tree1b9b844f40efe06b30d3b4e62dc4a70efd48d9b1 /OpenSim/Region
parentAdd a "inimaster" switch to OpenSim.ini. It will load a master ini file (diff)
downloadopensim-SC_OLD-8bc724a418038200af5ac6922c869b3cf6a9a882.zip
opensim-SC_OLD-8bc724a418038200af5ac6922c869b3cf6a9a882.tar.gz
opensim-SC_OLD-8bc724a418038200af5ac6922c869b3cf6a9a882.tar.bz2
opensim-SC_OLD-8bc724a418038200af5ac6922c869b3cf6a9a882.tar.xz
Fix a path issue i caused in a prior commit
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs13
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8bd2537..7598e16 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -160,14 +160,11 @@ namespace OpenSim
160 160
161 IConfig startupConfig = configSource.Configs["Startup"]; 161 IConfig startupConfig = configSource.Configs["Startup"];
162 162
163 string iniFileName = startupConfig.GetString("inifile", "OpenSim.ini"); 163 string iniFileName = startupConfig.GetString("inifile", "OpenSim.ini");
164 if (!iniFileName.StartsWith("/") && !iniFileName.StartsWith("\\")) 164 Application.iniFilePath = Path.Combine(Util.configDir(), iniFileName);
165 Application.iniFilePath = Path.Combine(Util.configDir(), iniFileName); 165
166 166 string masterFileName = startupConfig.GetString("inimaster", "");
167 string masterFileName = startupConfig.GetString("inimaster", ""); 167 string masterfilePath = Path.Combine(Util.configDir(), masterFileName);
168 string masterfilePath = masterFileName;
169 if (!masterFileName.StartsWith("/") && !masterFileName.StartsWith("\\") && masterFileName != "")
170 masterfilePath = Path.Combine(Util.configDir(), masterfilePath);
171 168
172 m_config = new OpenSimConfigSource(); 169 m_config = new OpenSimConfigSource();
173 m_config.Source = new IniConfigSource(); 170 m_config.Source = new IniConfigSource();