diff options
Diffstat (limited to 'OpenSim/Framework/General/Types/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/General/Types/RegionInfo.cs | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index 8ae61fc..cab6cd7 100644 --- a/OpenSim/Framework/General/Types/RegionInfo.cs +++ b/OpenSim/Framework/General/Types/RegionInfo.cs | |||
@@ -181,12 +181,25 @@ namespace OpenSim.Framework.Types | |||
181 | public string MasterAvatarLastName = ""; | 181 | public string MasterAvatarLastName = ""; |
182 | public string MasterAvatarSandboxPassword = ""; | 182 | public string MasterAvatarSandboxPassword = ""; |
183 | 183 | ||
184 | public EstateSettings estateSettings; | 184 | // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. |
185 | private static EstateSettings m_estateSettings; | ||
186 | public EstateSettings EstateSettings | ||
187 | { | ||
188 | get | ||
189 | { | ||
190 | if( m_estateSettings == null ) | ||
191 | { | ||
192 | m_estateSettings = new EstateSettings(); | ||
193 | } | ||
194 | |||
195 | return m_estateSettings; | ||
196 | } | ||
197 | |||
198 | } | ||
185 | 199 | ||
186 | public ConfigurationMember configMember; | 200 | public ConfigurationMember configMember; |
187 | public RegionInfo(string description, string filename) | 201 | public RegionInfo(string description, string filename) |
188 | { | 202 | { |
189 | estateSettings = new EstateSettings(); | ||
190 | configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); | 203 | configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); |
191 | configMember.performConfigurationRetrieve(); | 204 | configMember.performConfigurationRetrieve(); |
192 | } | 205 | } |
@@ -195,7 +208,7 @@ namespace OpenSim.Framework.Types | |||
195 | base(regionLocX, regionLocY, internalEndPoint, externalUri) | 208 | base(regionLocX, regionLocY, internalEndPoint, externalUri) |
196 | { | 209 | { |
197 | 210 | ||
198 | estateSettings = new EstateSettings(); | 211 | |
199 | } | 212 | } |
200 | 213 | ||
201 | //not in use, should swap to nini though. | 214 | //not in use, should swap to nini though. |