diff options
author | mingchen | 2007-08-03 00:14:11 +0000 |
---|---|---|
committer | mingchen | 2007-08-03 00:14:11 +0000 |
commit | 1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b (patch) | |
tree | 758b28c9bc755223c679a5bdada137e0ea4ffeb8 /OpenSim/Framework/General/Configuration/ConfigurationMember.cs | |
parent | Fixes flying glitch (hang) when crossing region boundaries (diff) | |
download | opensim-SC-1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b.zip opensim-SC-1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b.tar.gz opensim-SC-1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b.tar.bz2 opensim-SC-1c68c7a37f60983f61cddc2bf8b1e9b793c4fd2b.tar.xz |
*Estate settings are now saved in their own configuration file called estate_settings.xml using the configuration system.
Diffstat (limited to 'OpenSim/Framework/General/Configuration/ConfigurationMember.cs')
-rw-r--r-- | OpenSim/Framework/General/Configuration/ConfigurationMember.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs index eb5465f..c94fd8e 100644 --- a/OpenSim/Framework/General/Configuration/ConfigurationMember.cs +++ b/OpenSim/Framework/General/Configuration/ConfigurationMember.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Configuration | |||
64 | configOption.configurationType = configuration_type; | 64 | configOption.configurationType = configuration_type; |
65 | configOption.configurationUseDefaultNoPrompt = use_default_no_prompt; | 65 | configOption.configurationUseDefaultNoPrompt = use_default_no_prompt; |
66 | 66 | ||
67 | if (configuration_key != "" && configuration_question != "") | 67 | if ((configuration_key != "" && configuration_question != "") || (configuration_key != "" && use_default_no_prompt)) |
68 | { | 68 | { |
69 | if (!configurationOptions.Contains(configOption)) | 69 | if (!configurationOptions.Contains(configOption)) |
70 | { | 70 | { |
@@ -375,5 +375,13 @@ namespace OpenSim.Framework.Configuration | |||
375 | pluginAssembly = null; | 375 | pluginAssembly = null; |
376 | return plug; | 376 | return plug; |
377 | } | 377 | } |
378 | |||
379 | public void forceSetConfigurationOption(string configuration_key, string configuration_value) | ||
380 | { | ||
381 | this.configurationPlugin.LoadData(); | ||
382 | this.configurationPlugin.SetAttribute(configuration_key, configuration_value); | ||
383 | this.configurationPlugin.Commit(); | ||
384 | this.configurationPlugin.Close(); | ||
385 | } | ||
378 | } | 386 | } |
379 | } | 387 | } |