aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ConfigurationMember.cs
diff options
context:
space:
mode:
authormingchen2008-01-04 14:14:15 +0000
committermingchen2008-01-04 14:14:15 +0000
commit81b4c7be3e84b29e5fcc387f578afdc07b806048 (patch)
tree5e835924288eb49fb92d293133ee68ae728d7f60 /OpenSim/Framework/ConfigurationMember.cs
parent* Fixed situation where sometimes your avatar tries to land and gets 'put' 80... (diff)
downloadopensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.zip
opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.gz
opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.bz2
opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.xz
*Added ability to skip any use of the console when configuring and assume default value. This is useful when the server is running by itself and a new region request is added without sufficient information
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index a5ab613..2def070 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -51,29 +51,31 @@ namespace OpenSim.Framework
51 private ConfigurationOptionResult resultFunction; 51 private ConfigurationOptionResult resultFunction;
52 52
53 private IGenericConfig configurationPlugin = null; 53 private IGenericConfig configurationPlugin = null;
54 54 private bool useConsoleToPromptOnError = true;
55 /// <summary> 55 /// <summary>
56 /// This is the default configuration DLL loaded 56 /// This is the default configuration DLL loaded
57 /// </summary> 57 /// </summary>
58 private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll"; 58 private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll";
59 59
60 public ConfigurationMember(string configuration_filename, string configuration_description, 60 public ConfigurationMember(string configuration_filename, string configuration_description,
61 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function) 61 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
62 { 62 {
63 configurationFilename = configuration_filename; 63 configurationFilename = configuration_filename;
64 configurationDescription = configuration_description; 64 configurationDescription = configuration_description;
65 loadFunction = load_function; 65 loadFunction = load_function;
66 resultFunction = result_function; 66 resultFunction = result_function;
67 useConsoleToPromptOnError = use_console_to_prompt_on_error;
67 } 68 }
68 69
69 public ConfigurationMember(XmlNode configuration_xml, string configuration_description, 70 public ConfigurationMember(XmlNode configuration_xml, string configuration_description,
70 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function) 71 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
71 { 72 {
72 configurationFilename = ""; 73 configurationFilename = "";
73 configurationFromXMLNode = configuration_xml; 74 configurationFromXMLNode = configuration_xml;
74 configurationDescription = configuration_description; 75 configurationDescription = configuration_description;
75 loadFunction = load_function; 76 loadFunction = load_function;
76 resultFunction = result_function; 77 resultFunction = result_function;
78 useConsoleToPromptOnError = use_console_to_prompt_on_error;
77 } 79 }
78 80
79 public void setConfigurationFilename(string filename) 81 public void setConfigurationFilename(string filename)
@@ -231,7 +233,7 @@ namespace OpenSim.Framework
231 233
232 if (attribute == null) 234 if (attribute == null)
233 { 235 {
234 if (configOption.configurationUseDefaultNoPrompt) 236 if (configOption.configurationUseDefaultNoPrompt || useConsoleToPromptOnError == false)
235 { 237 {
236 console_result = configOption.configurationDefault; 238 console_result = configOption.configurationDefault;
237 } 239 }