2 files changed, 123 insertions, 123 deletions

diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
index d72c40f..8b74195 100644
--- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
+++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
@@ -1,89 +1,89 @@
-using System;

-using System.Collections.Generic;

-using System.Net;

-using System.IO;

-using System.Text;

-

-using OpenSim.Framework.Configuration.Interfaces;

-

-namespace OpenSim.Framework.Configuration.HTTP

-{

-    public class HTTPConfiguration : IGenericConfig

-    {

-        RemoteConfigSettings remoteConfigSettings;

-

-        XmlConfiguration xmlConfig;

-

-        private string configFileName = "";

-

-        public HTTPConfiguration()

-        {

-            remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");

-            xmlConfig = new XmlConfiguration();

-        }

-

-        public void SetFileName(string fileName)

-        {

-            configFileName = fileName;

-        }

-

-        public void LoadData()

-        {

-            try

-            {

-                StringBuilder sb = new StringBuilder();

-

-                byte[] buf = new byte[8192];

-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.remoteConfigSettings.baseConfigURL + this.configFileName);

-                HttpWebResponse response = (HttpWebResponse)request.GetResponse();

-

-                Stream resStream = response.GetResponseStream();

-

-                string tempString = null;

-                int count = 0;

-

-                do

-                {

-                    count = resStream.Read(buf, 0, buf.Length);

-                    if (count != 0)

-                    {

-                        tempString = Encoding.ASCII.GetString(buf, 0, count);

-                        sb.Append(tempString);

-                    }

-                }

-                while (count > 0);

-                LoadDataFromString(sb.ToString());

-            }

-            catch (WebException)

-            {

-                Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead.");

-                xmlConfig.SetFileName(configFileName);

-                xmlConfig.LoadData();

-            }

-        }

-

-        public void LoadDataFromString(string data)

-        {

-            xmlConfig.LoadDataFromString(data);

-            

-        }

-

-        public string GetAttribute(string attributeName)

-        {

-            return xmlConfig.GetAttribute(attributeName);

-        }

-

-        public bool SetAttribute(string attributeName, string attributeValue)

-        {

-            return true;

-        }

-

-        public void Commit()

-        {

-        }

-

-        public void Close()

-        {

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.IO;
+using System.Text;
+
+using OpenSim.Framework.Configuration.Interfaces;
+
+namespace OpenSim.Framework.Configuration.HTTP
+{
+    public class HTTPConfiguration : IGenericConfig
+    {
+        RemoteConfigSettings remoteConfigSettings;
+
+        XmlConfiguration xmlConfig;
+
+        private string configFileName = "";
+
+        public HTTPConfiguration()
+        {
+            remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");
+            xmlConfig = new XmlConfiguration();
+        }
+
+        public void SetFileName(string fileName)
+        {
+            configFileName = fileName;
+        }
+
+        public void LoadData()
+        {
+            try
+            {
+                StringBuilder sb = new StringBuilder();
+
+                byte[] buf = new byte[8192];
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(this.remoteConfigSettings.baseConfigURL + this.configFileName);
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+
+                Stream resStream = response.GetResponseStream();
+
+                string tempString = null;
+                int count = 0;
+
+                do
+                {
+                    count = resStream.Read(buf, 0, buf.Length);
+                    if (count != 0)
+                    {
+                        tempString = Encoding.ASCII.GetString(buf, 0, count);
+                        sb.Append(tempString);
+                    }
+                }
+                while (count > 0);
+                LoadDataFromString(sb.ToString());
+            }
+            catch (WebException)
+            {
+                Console.MainLog.Instance.Warn("Unable to connect to remote configuration file (" + remoteConfigSettings.baseConfigURL + configFileName + "). Creating local file instead.");
+                xmlConfig.SetFileName(configFileName);
+                xmlConfig.LoadData();
+            }
+        }
+
+        public void LoadDataFromString(string data)
+        {
+            xmlConfig.LoadDataFromString(data);
+            
+        }
+
+        public string GetAttribute(string attributeName)
+        {
+            return xmlConfig.GetAttribute(attributeName);
+        }
+
+        public bool SetAttribute(string attributeName, string attributeValue)
+        {
+            return true;
+        }
+
+        public void Commit()
+        {
+        }
+
+        public void Close()
+        {
+        }
+    }
+}
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
index e3cfac7..77719ee 100644
--- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
+++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs
@@ -1,34 +1,34 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenSim.Framework.Configuration;

-

-namespace OpenSim.Framework.Configuration.HTTP

-{

-    public class RemoteConfigSettings

-    {

-        private ConfigurationMember configMember;

-

-        public string baseConfigURL = "";

-        public RemoteConfigSettings(string filename)

-        {

-            configMember = new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, handleIncomingConfiguration);

-            configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll");

-            configMember.performConfigurationRetrieve();

-        }

-

-        public void loadConfigurationOptions()

-        {

-            configMember.addConfigurationOption("base_config_url", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "URL Containing Configuration Files", "http://localhost/", false);

-        }

-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)

-        {

-            if (configuration_key == "base_config_url")

-            {

-                baseConfigURL = (string)configuration_result;

-            }

-            return true;

-        }

-    }

-}

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework.Configuration;
+
+namespace OpenSim.Framework.Configuration.HTTP
+{
+    public class RemoteConfigSettings
+    {
+        private ConfigurationMember configMember;
+
+        public string baseConfigURL = "";
+        public RemoteConfigSettings(string filename)
+        {
+            configMember = new ConfigurationMember(filename, "REMOTE CONFIG SETTINGS", loadConfigurationOptions, handleIncomingConfiguration);
+            configMember.forceConfigurationPluginLibrary("OpenSim.Framework.Configuration.XML.dll");
+            configMember.performConfigurationRetrieve();
+        }
+
+        public void loadConfigurationOptions()
+        {
+            configMember.addConfigurationOption("base_config_url", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "URL Containing Configuration Files", "http://localhost/", false);
+        }
+        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
+        {
+            if (configuration_key == "base_config_url")
+            {
+                baseConfigURL = (string)configuration_result;
+            }
+            return true;
+        }
+    }
+}