aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AssetConfig.cs2
-rw-r--r--OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs2
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs10
-rw-r--r--OpenSim/Framework/EstateSettings.cs2
-rw-r--r--OpenSim/Framework/GridConfig.cs2
-rw-r--r--OpenSim/Framework/InventoryConfig.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs8
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs4
-rw-r--r--OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs2
-rw-r--r--OpenSim/Framework/UserConfig.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
-rw-r--r--OpenSim/Tools/Export/OpenSimExport.cs2
12 files changed, 22 insertions, 20 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
45 public AssetConfig(string description, string filename) 45 public AssetConfig(string description, string filename)
46 { 46 {
47 configMember = 47 configMember =
48 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); 48 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
49 configMember.performConfigurationRetrieve(); 49 configMember.performConfigurationRetrieve();
50 } 50 }
51 51
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
38 { 38 {
39 configMember = 39 configMember =
40 new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, 40 new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions,
41 handleIncomingConfiguration); 41 handleIncomingConfiguration,true);
42 configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll"); 42 configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll");
43 configMember.performConfigurationRetrieve(); 43 configMember.performConfigurationRetrieve();
44 } 44 }
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 }
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
749 { 749 {
750 configMember = 750 configMember =
751 new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", 751 new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS",
752 loadConfigurationOptions, handleIncomingConfiguration); 752 loadConfigurationOptions, handleIncomingConfiguration,true);
753 configMember.performConfigurationRetrieve(); 753 configMember.performConfigurationRetrieve();
754 } 754 }
755 } 755 }
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
55 public GridConfig(string description, string filename) 55 public GridConfig(string description, string filename)
56 { 56 {
57 configMember = 57 configMember =
58 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); 58 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
59 configMember.performConfigurationRetrieve(); 59 configMember.performConfigurationRetrieve();
60 } 60 }
61 61
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
48 public InventoryConfig(string description, string filename) 48 public InventoryConfig(string description, string filename)
49 { 49 {
50 configMember = 50 configMember =
51 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); 51 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
52 configMember.performConfigurationRetrieve(); 52 configMember.performConfigurationRetrieve();
53 } 53 }
54 54
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
187 187
188 public ConfigurationMember configMember; 188 public ConfigurationMember configMember;
189 189
190 public RegionInfo(string description, string filename) 190 public RegionInfo(string description, string filename, bool skipConsoleConfig)
191 { 191 {
192 configMember = 192 configMember =
193 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); 193 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,!skipConsoleConfig);
194 configMember.performConfigurationRetrieve(); 194 configMember.performConfigurationRetrieve();
195 } 195 }
196 196
197 public RegionInfo(string description, XmlNode xmlNode) 197 public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig)
198 { 198 {
199 configMember = 199 configMember =
200 new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration); 200 new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
201 configMember.performConfigurationRetrieve(); 201 configMember.performConfigurationRetrieve();
202 } 202 }
203 203
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
49 49
50 if (configFiles.Length == 0) 50 if (configFiles.Length == 0)
51 { 51 {
52 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml")); 52 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"),false);
53 configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); 53 configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
54 } 54 }
55 55
56 RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; 56 RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];
57 for (int i = 0; i < configFiles.Length; i++) 57 for (int i = 0; i < configFiles.Length; i++)
58 { 58 {
59 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]); 59 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i],false);
60 regionInfos[i] = regionInfo; 60 regionInfos[i] = regionInfo;
61 } 61 }
62 62
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
86 { 86 {
87 MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml); 87 MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
88 regionInfos[i] = 88 regionInfos[i] =
89 new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i]); 89 new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false);
90 } 90 }
91 91
92 return regionInfos; 92 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
54 public UserConfig(string description, string filename) 54 public UserConfig(string description, string filename)
55 { 55 {
56 configMember = 56 configMember =
57 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); 57 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,true);
58 configMember.performConfigurationRetrieve(); 58 configMember.performConfigurationRetrieve();
59 } 59 }
60 60
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 6758808..0e8d71a 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -394,7 +394,7 @@ namespace OpenSim
394 394
395 private static void CreateDefaultRegionInfoXml(string fileName) 395 private static void CreateDefaultRegionInfoXml(string fileName)
396 { 396 {
397 new RegionInfo("DEFAULT REGION CONFIG", fileName); 397 new RegionInfo("DEFAULT REGION CONFIG", fileName,false);
398 } 398 }
399 399
400 protected override StorageManager CreateStorageManager(string connectionstring) 400 protected override StorageManager CreateStorageManager(string connectionstring)
@@ -771,7 +771,7 @@ namespace OpenSim
771 break; 771 break;
772 772
773 case "create-region": 773 case "create-region":
774 CreateRegion(new RegionInfo(cmdparams[0], "Regions/" + cmdparams[1])); 774 CreateRegion(new RegionInfo(cmdparams[0], "Regions/" + cmdparams[1],false));
775 break; 775 break;
776 776
777 case "remove-region": 777 case "remove-region":
diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs
index 4a5ba5d..765f6a2 100644
--- a/OpenSim/Tools/Export/OpenSimExport.cs
+++ b/OpenSim/Tools/Export/OpenSimExport.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Tools.Export
61 public static void Main(string[] args) 61 public static void Main(string[] args)
62 { 62 {
63 OpenSimExport export = new OpenSimExport(InitConfig(args)); 63 OpenSimExport export = new OpenSimExport(InitConfig(args));
64 RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml"); 64 RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false);
65 65
66 Console.WriteLine("This application does nothing useful yet: " + reg.RegionID); 66 Console.WriteLine("This application does nothing useful yet: " + reg.RegionID);
67 foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID)) 67 foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID))