* Made EstateSetting static since there's only one instance, and we only need to create it once

* Now cacheing RegionInfos indefinitively; we should add a tiomeout to this cache
This commit is contained in:
lbsa71
2007-10-22 17:55:49 +00:00
parent 81e5cf14ce
commit dd770c384c
7 changed files with 141 additions and 109 deletions

View File

@@ -181,12 +181,25 @@ namespace OpenSim.Framework.Types
public string MasterAvatarLastName = "";
public string MasterAvatarSandboxPassword = "";
public EstateSettings estateSettings;
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
private static EstateSettings m_estateSettings;
public EstateSettings EstateSettings
{
get
{
if( m_estateSettings == null )
{
m_estateSettings = new EstateSettings();
}
return m_estateSettings;
}
}
public ConfigurationMember configMember;
public RegionInfo(string description, string filename)
{
estateSettings = new EstateSettings();
configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
configMember.performConfigurationRetrieve();
}
@@ -195,7 +208,7 @@ namespace OpenSim.Framework.Types
base(regionLocX, regionLocY, internalEndPoint, externalUri)
{
estateSettings = new EstateSettings();
}
//not in use, should swap to nini though.