diff options
author | MW | 2008-06-26 17:20:08 +0000 |
---|---|---|
committer | MW | 2008-06-26 17:20:08 +0000 |
commit | 682ec53420ffac9918febc12b7140363602812e5 (patch) | |
tree | a3d45436d19e0388c9f52f7e4bc8058f52d71ec5 /OpenSim/ApplicationPlugins/Rest | |
parent | WORK-IN-PRGRESS: beware of falling pieces and shifting (diff) | |
download | opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.zip opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.tar.gz opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.tar.bz2 opensim-SC_OLD-682ec53420ffac9918febc12b7140363602812e5.tar.xz |
As per the suggestion on the mailing list, added support for a OpenSim.xml config file, instead of a ini file. INI files still work the same as they did before, just now if a ini file isn't found, it looks for a OpenSim.xml file (of course in xml format) and if found uses that.
Includes a OpenSim.Example.xml for reference (the default settings saved as a xml file).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index e4bd544..60a7d27 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | |||
@@ -203,7 +203,7 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
203 | 203 | ||
204 | try | 204 | try |
205 | { | 205 | { |
206 | if ((_config = openSim.ConfigSource.Configs["RestPlugins"]) == null) | 206 | if ((_config = openSim.ConfigSource.ConfigSource.Configs["RestPlugins"]) == null) |
207 | { | 207 | { |
208 | m_log.WarnFormat("{0} Rest Plugins not configured", MsgID); | 208 | m_log.WarnFormat("{0} Rest Plugins not configured", MsgID); |
209 | return; | 209 | return; |
@@ -225,7 +225,7 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
225 | _prefix = _config.GetString("prefix", "/admin"); | 225 | _prefix = _config.GetString("prefix", "/admin"); |
226 | 226 | ||
227 | // Get plugin specific config | 227 | // Get plugin specific config |
228 | _pluginConfig = openSim.ConfigSource.Configs[ConfigName]; | 228 | _pluginConfig = openSim.ConfigSource.ConfigSource.Configs[ConfigName]; |
229 | 229 | ||
230 | 230 | ||
231 | m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID); | 231 | m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID); |