diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/ConfigurationMember.cs | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs index 1fb4866..e985c06 100644 --- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs +++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs | |||
@@ -25,22 +25,24 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using System.IO; | 29 | using System.IO; |
29 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | ||
30 | using System.Text; | 32 | using System.Text; |
31 | using OpenSim.Framework.Console; | 33 | using log4net; |
32 | 34 | ||
33 | namespace OpenSim.Framework.Configuration.HTTP | 35 | namespace OpenSim.Framework.Configuration.HTTP |
34 | { | 36 | { |
35 | public class HTTPConfiguration : IGenericConfig | 37 | public class HTTPConfiguration : IGenericConfig |
36 | { | 38 | { |
37 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
38 | 40 | ||
39 | private RemoteConfigSettings remoteConfigSettings; | 41 | private RemoteConfigSettings remoteConfigSettings; |
40 | 42 | ||
41 | private XmlConfiguration xmlConfig; | 43 | private XmlConfiguration xmlConfig; |
42 | 44 | ||
43 | private string configFileName = System.String.Empty; | 45 | private string configFileName = String.Empty; |
44 | 46 | ||
45 | public HTTPConfiguration() | 47 | public HTTPConfiguration() |
46 | { | 48 | { |
diff --git a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs index 88945ff..4e37ec6 100644 --- a/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs +++ b/OpenSim/Framework/Configuration/HTTP/RemoteConfigSettings.cs | |||
@@ -25,13 +25,15 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
29 | |||
28 | namespace OpenSim.Framework.Configuration.HTTP | 30 | namespace OpenSim.Framework.Configuration.HTTP |
29 | { | 31 | { |
30 | public class RemoteConfigSettings | 32 | public class RemoteConfigSettings |
31 | { | 33 | { |
32 | private ConfigurationMember configMember; | 34 | private ConfigurationMember configMember; |
33 | 35 | ||
34 | public string baseConfigURL = System.String.Empty; | 36 | public string baseConfigURL = String.Empty; |
35 | 37 | ||
36 | public RemoteConfigSettings(string filename) | 38 | public RemoteConfigSettings(string filename) |
37 | { | 39 | { |
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs index c27a134..12590b4 100644 --- a/OpenSim/Framework/ConfigurationMember.cs +++ b/OpenSim/Framework/ConfigurationMember.cs | |||
@@ -32,13 +32,14 @@ using System.Net; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Xml; | 33 | using System.Xml; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using log4net; | ||
35 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
36 | 37 | ||
37 | namespace OpenSim.Framework | 38 | namespace OpenSim.Framework |
38 | { | 39 | { |
39 | public class ConfigurationMember | 40 | public class ConfigurationMember |
40 | { | 41 | { |
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
42 | 43 | ||
43 | public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); | 44 | public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); |
44 | 45 | ||