10 files changed, 19 insertions, 17 deletions

diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index fe77ab8..f85129b 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework
         public AssetConfig(string description, string filename)
         {
             configMember =
-                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
+                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
             configMember.performConfigurationRetrieve();
         }
 
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
index 332066c..8fddb60 100644
--- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
+++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Configuration.HTTP
         {
             configMember =
                 new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions,
-                                        handleIncomingConfiguration);
+                                        handleIncomingConfiguration,true);
             configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll");
             configMember.performConfigurationRetrieve();
         }
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
         private ConfigurationOptionResult resultFunction;
 
         private IGenericConfig configurationPlugin = null;
-
+        private bool useConsoleToPromptOnError = true;
         /// <summary>
         /// This is the default configuration DLL loaded
         /// </summary>
         private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll";
 
         public ConfigurationMember(string configuration_filename, string configuration_description,
-                                   ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)
+                                   ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
         {
             configurationFilename = configuration_filename;
             configurationDescription = configuration_description;
             loadFunction = load_function;
             resultFunction = result_function;
+            useConsoleToPromptOnError = use_console_to_prompt_on_error;
         }
 
         public ConfigurationMember(XmlNode configuration_xml, string configuration_description,
-                                   ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)
+                                   ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
         {
             configurationFilename = "";
             configurationFromXMLNode = configuration_xml;
             configurationDescription = configuration_description;
             loadFunction = load_function;
             resultFunction = result_function;
+            useConsoleToPromptOnError = use_console_to_prompt_on_error;
         }
 
         public void setConfigurationFilename(string filename)
@@ -231,7 +233,7 @@ namespace OpenSim.Framework
 
                     if (attribute == null)
                     {
-                        if (configOption.configurationUseDefaultNoPrompt)
+                        if (configOption.configurationUseDefaultNoPrompt || useConsoleToPromptOnError == false)
                         {
                             console_result = configOption.configurationDefault;
                         }
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 9e4b9a4..b2bd181 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -749,7 +749,7 @@ namespace OpenSim.Framework
             {
                 configMember =
                     new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS",
-                                            loadConfigurationOptions, handleIncomingConfiguration);
+                                            loadConfigurationOptions, handleIncomingConfiguration,true);
                 configMember.performConfigurationRetrieve();
             }
         }
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 8821010..c07adea 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
         public GridConfig(string description, string filename)
         {
             configMember =
-                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
+                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
             configMember.performConfigurationRetrieve();
         }
 
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 4fdac37..28cd552 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework
         public InventoryConfig(string description, string filename)
         {
             configMember =
-                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
+                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
             configMember.performConfigurationRetrieve();
         }
 
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 17811cd..3c4fcba 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -187,17 +187,17 @@ namespace OpenSim.Framework
 
         public ConfigurationMember configMember;
 
-        public RegionInfo(string description, string filename)
+        public RegionInfo(string description, string filename, bool skipConsoleConfig)
         {
             configMember =
-                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
+                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,!skipConsoleConfig);
             configMember.performConfigurationRetrieve();
         }
 
-        public RegionInfo(string description, XmlNode xmlNode)
+        public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig)
         {
             configMember =
-                new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration);
+                new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
             configMember.performConfigurationRetrieve();
         }
 
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index a710f50..66a6ec8 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -49,14 +49,14 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
 
             if (configFiles.Length == 0)
             {
-                new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"));
+                new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"),false);
                 configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
             }
 
             RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];
             for (int i = 0; i < configFiles.Length; i++)
             {
-                RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]);
+                RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i],false);
                 regionInfos[i] = regionInfo;
             }
 
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 1625fa6..80acbae 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.RegionLoader.Web
                         {
                             MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
                             regionInfos[i] =
-                                new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i]);
+                                new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false);
                         }
 
                         return regionInfos;
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 7ca2512..c9957ef 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Framework
         public UserConfig(string description, string filename)
         {
             configMember =
-                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
+                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,true);
             configMember.performConfigurationRetrieve();
         }