5 files changed, 18 insertions, 16 deletions

diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index 0d48683..e27c88b 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Configuration.HTTP
 
         private XmlConfiguration xmlConfig;
 
-        private string configFileName = "";
+        private string configFileName = System.String.Empty;
 
         public HTTPConfiguration()
         {
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
index 8fddb60..8575d3b 100644
--- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
+++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework.Configuration.HTTP
     {
         private ConfigurationMember configMember;
 
-        public string baseConfigURL = "";
+        public string baseConfigURL = System.String.Empty;
 
         public RemoteConfigSettings(string filename)
         {
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
index 8bb31f8..4c50e53 100644
--- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
+++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
@@ -71,9 +71,9 @@ namespace OpenSim.Framework.Configuration
                 else
                 {
                     createdFile = true;
-                    rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
+                    rootNode = doc.CreateNode(XmlNodeType.Element, "Root", String.Empty);
                     doc.AppendChild(rootNode);
-                    configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
+                    configNode = doc.CreateNode(XmlNodeType.Element, "Config", String.Empty);
                     rootNode.AppendChild(configNode);
                 }
 
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 4ae59d6..7590495 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -44,8 +44,8 @@ namespace OpenSim.Framework
         public delegate void ConfigurationOptionsLoad();
 
         private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();
-        private string configurationFilename = "";
-        private string configurationDescription = "";
+        private string configurationFilename = String.Empty;
+        private string configurationDescription = String.Empty;
         private XmlNode configurationFromXMLNode = null;
         private ConfigurationOptionsLoad loadFunction;
         private ConfigurationOptionResult resultFunction;
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
         public ConfigurationMember(XmlNode configuration_xml, string configuration_description,
                                    ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
         {
-            configurationFilename = "";
+            configurationFilename = String.Empty;
             configurationFromXMLNode = configuration_xml;
             configurationDescription = configuration_description;
             loadFunction = load_function;
@@ -100,8 +100,8 @@ namespace OpenSim.Framework
 
         private void checkAndAddConfigOption(ConfigurationOption option)
         {
-            if ((option.configurationKey != "" && option.configurationQuestion != "") ||
-                (option.configurationKey != "" && option.configurationUseDefaultNoPrompt))
+            if ((option.configurationKey != String.Empty && option.configurationQuestion != String.Empty) ||
+                (option.configurationKey != String.Empty && option.configurationUseDefaultNoPrompt))
             {
                 if (!configurationOptions.Contains(option))
                 {
@@ -190,7 +190,7 @@ namespace OpenSim.Framework
                 return;
             }
 
-            if (configurationFilename.Trim() != "")
+            if (configurationFilename.Trim() != String.Empty)
             {
                 configurationPlugin.SetFileName(configurationFilename);
                 try
@@ -220,11 +220,11 @@ namespace OpenSim.Framework
             {
                 bool convertSuccess = false;
                 object return_result = null;
-                string errorMessage = "";
+                string errorMessage = String.Empty;
                 bool ignoreNextFromConfig = false;
                 while (convertSuccess == false)
                 {
-                    string console_result = "";
+                    string console_result = String.Empty;
                     string attribute = null;
                     if (useFile || configurationFromXMLNode != null)
                     {
@@ -250,7 +250,7 @@ namespace OpenSim.Framework
                                  configOption.shouldIBeAsked(configOption.configurationKey)) ||
                                 configOption.shouldIBeAsked == null)
                             {
-                                if (configurationDescription.Trim() != "")
+                                if (configurationDescription.Trim() != String.Empty)
                                 {
                                     console_result =
                                         MainLog.Instance.CmdPrompt(
diff --git a/OpenSim/Framework/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs
index 7f9b5b5..d8be6f8 100644
--- a/OpenSim/Framework/ConfigurationOption.cs
+++ b/OpenSim/Framework/ConfigurationOption.cs
@@ -26,6 +26,8 @@
 * 
 */
 
+using System;
+
 namespace OpenSim.Framework
 {
     public class ConfigurationOption
@@ -52,9 +54,9 @@ namespace OpenSim.Framework
             TYPE_DOUBLE
         } ;
 
-        public string configurationKey = "";
-        public string configurationQuestion = "";
-        public string configurationDefault = "";
+        public string configurationKey = String.Empty;
+        public string configurationQuestion = String.Empty;
+        public string configurationDefault = String.Empty;
 
         public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;
         public bool configurationUseDefaultNoPrompt = false;