aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 751ca9d..e953182 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -31,6 +31,7 @@ using System.Net.Sockets;
31using System.Xml; 31using System.Xml;
32using libsecondlife; 32using libsecondlife;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework.Console;
34 35
35namespace OpenSim.Framework 36namespace OpenSim.Framework
36{ 37{
@@ -176,7 +177,7 @@ namespace OpenSim.Framework
176 public string MasterAvatarSandboxPassword = String.Empty; 177 public string MasterAvatarSandboxPassword = String.Empty;
177 178
178 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 179 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
179 private static EstateSettings m_estateSettings; 180 private EstateSettings m_estateSettings;
180 181
181 public EstateSettings EstateSettings 182 public EstateSettings EstateSettings
182 { 183 {
@@ -196,7 +197,7 @@ namespace OpenSim.Framework
196 public RegionInfo(string description, string filename, bool skipConsoleConfig) 197 public RegionInfo(string description, string filename, bool skipConsoleConfig)
197 { 198 {
198 configMember = 199 configMember =
199 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,!skipConsoleConfig); 200 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
200 configMember.performConfigurationRetrieve(); 201 configMember.performConfigurationRetrieve();
201 } 202 }
202 203