ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 10:15:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved iniFilePath to a static and put it in OpenSim.Application.iniFilePath.

Browse Source 
Refreshing config based on this.
Temporarily disabled feature to refresh config file while running.
This commit is contained in:
Tedd Hansen
2008-02-01 23:56:09 +00:00
parent 4715453159
commit 694642a482
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Application/Application.cs
View File

@@ -35,6 +35,8 @@ namespace OpenSim
{
public class Application
{
public static string iniFilePath = "";
//could move our main function into OpenSimMain and kill this class
[STAThread]
public static void Main(string[] args)

14
OpenSim/Region/Application/OpenSimMain.cs
View File

@@ -125,21 +125,21 @@ namespace OpenSim
AddinManager.Initialize(".");
AddinManager.Registry.Update(null);
string iniFilePath = startupConfig.GetString("inifile", "OpenSim.ini");
Application.iniFilePath = startupConfig.GetString("inifile", "OpenSim.ini");
m_config = new IniConfigSource();
//check for .INI file (either default or name passed in command line)
if (File.Exists(iniFilePath))
if (File.Exists(Application.iniFilePath))
{
m_config.Merge(new IniConfigSource(iniFilePath));
m_config.Merge(new IniConfigSource(Application.iniFilePath));
m_config.Merge(configSource);
}
else
{
iniFilePath = Path.Combine(Util.configDir(), iniFilePath);
if (File.Exists(iniFilePath))
Application.iniFilePath = Path.Combine(Util.configDir(), Application.iniFilePath);
if (File.Exists(Application.iniFilePath))
{
m_config.Merge(new IniConfigSource(iniFilePath));
m_config.Merge(new IniConfigSource(Application.iniFilePath));
m_config.Merge(configSource);
}
else
@@ -149,7 +149,7 @@ namespace OpenSim
m_config.Merge(configSource);
m_config.Save(iniFilePath);
m_config.Save(Application.iniFilePath);
}
}