ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis #2133

Browse Source 
Thank you, Xugu Madison and ChrisDown, for a patch that
fixes linux filename extensions from .Xml back to .xml
This commit is contained in:
Melanie Thielker
2008-09-06 14:58:23 +00:00
parent f342bd1e96
commit 9e545c9984
28 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ namespace OpenSim
/// <summary>
/// The file used to load and save prim backup xml if no filename has been specified
/// </summary>
protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.Xml";
protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml";
/// <summary>
/// The file used to load and save an opensim archive if no filename has been specified
@@ -178,17 +178,17 @@ namespace OpenSim
}
else
{
if (File.Exists("OpenSim.Xml"))
if (File.Exists("OpenSim.xml"))
{
//check for a xml config file
Application.iniFilePath = "OpenSim.Xml";
Application.iniFilePath = "OpenSim.xml";
m_config.Source = new XmlConfigSource();
m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath));
m_config.Source.Merge(configSource);
}
else
{
//Application.iniFilePath = "OpenSim.Xml";
//Application.iniFilePath = "OpenSim.xml";
// m_config.ConfigSource = new XmlConfigSource();
// no default config files, so set default values, and save it
m_config.Source.Merge(DefaultConfig());