aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/EstateSettings.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/EstateSettings.cs')
-rw-r--r--OpenSim/Framework/EstateSettings.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index b5a3468..26924eb 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -28,11 +28,14 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework.Console;
31 32
32namespace OpenSim.Framework 33namespace OpenSim.Framework
33{ 34{
34 public class EstateSettings 35 public class EstateSettings
35 { 36 {
37 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
38
36 //Settings to this island 39 //Settings to this island
37 private float m_billableFactor; 40 private float m_billableFactor;
38 41
@@ -734,7 +737,7 @@ namespace OpenSim.Framework
734 } 737 }
735 else 738 else
736 { 739 {
737 OpenSim.Framework.Console.MainLog.Instance.Error("ESTATESETTINGS", "Unable to locate estate manager : " + avatarID.ToString() + " for removal"); 740 m_log.Error("[ESTATESETTINGS]: Unable to locate estate manager : " + avatarID.ToString() + " for removal");
738 } 741 }
739 } 742 }
740 743
@@ -749,7 +752,7 @@ namespace OpenSim.Framework
749 { 752 {
750 configMember = 753 configMember =
751 new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", 754 new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS",
752 loadConfigurationOptions, handleIncomingConfiguration,true); 755 loadConfigurationOptions, handleIncomingConfiguration, true);
753 configMember.performConfigurationRetrieve(); 756 configMember.performConfigurationRetrieve();
754 } 757 }
755 } 758 }