aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-06 14:58:23 +0000
committerMelanie Thielker2008-09-06 14:58:23 +0000
commit9e545c9984790ddeabba0bf86e229af90da09ad6 (patch)
treebf305b155bcd2aadc1fb8a209d262a86f676fca3 /OpenSim/Region/Application
parent* Replace a Try/catch I commented out while testing/fixing issues. (diff)
downloadopensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.zip
opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.gz
opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.bz2
opensim-SC-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.xz
Mantis #2133
Thank you, Xugu Madison and ChrisDown, for a patch that fixes linux filename extensions from .Xml back to .xml
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 99584da..e2b2bbc 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -64,7 +64,7 @@ namespace OpenSim
64 /// <summary> 64 /// <summary>
65 /// The file used to load and save prim backup xml if no filename has been specified 65 /// The file used to load and save prim backup xml if no filename has been specified
66 /// </summary> 66 /// </summary>
67 protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.Xml"; 67 protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml";
68 68
69 /// <summary> 69 /// <summary>
70 /// The file used to load and save an opensim archive if no filename has been specified 70 /// The file used to load and save an opensim archive if no filename has been specified
@@ -178,17 +178,17 @@ namespace OpenSim
178 } 178 }
179 else 179 else
180 { 180 {
181 if (File.Exists("OpenSim.Xml")) 181 if (File.Exists("OpenSim.xml"))
182 { 182 {
183 //check for a xml config file 183 //check for a xml config file
184 Application.iniFilePath = "OpenSim.Xml"; 184 Application.iniFilePath = "OpenSim.xml";
185 m_config.Source = new XmlConfigSource(); 185 m_config.Source = new XmlConfigSource();
186 m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); 186 m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath));
187 m_config.Source.Merge(configSource); 187 m_config.Source.Merge(configSource);
188 } 188 }
189 else 189 else
190 { 190 {
191 //Application.iniFilePath = "OpenSim.Xml"; 191 //Application.iniFilePath = "OpenSim.xml";
192 // m_config.ConfigSource = new XmlConfigSource(); 192 // m_config.ConfigSource = new XmlConfigSource();
193 // no default config files, so set default values, and save it 193 // no default config files, so set default values, and save it
194 m_config.Source.Merge(DefaultConfig()); 194 m_config.Source.Merge(DefaultConfig());