Coding standards: A local variable may not use the prefix m_
parent
385a265971
commit
b43717a397
|
@ -75,14 +75,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
|
|||
internal new bool m_enabled = false;
|
||||
|
||||
#region ISharedRegionModule Members
|
||||
public override void Initialise(IConfigSource config)
|
||||
public override void Initialise(IConfigSource configSource)
|
||||
{
|
||||
IConfig m_config = config.Configs["Concierge"];
|
||||
IConfig config = configSource.Configs["Concierge"];
|
||||
|
||||
if (null == m_config)
|
||||
if (config == null)
|
||||
return;
|
||||
|
||||
if (!m_config.GetBoolean("enabled", false))
|
||||
if (!config.GetBoolean("enabled", false))
|
||||
return;
|
||||
|
||||
m_enabled = true;
|
||||
|
@ -91,7 +91,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
|
|||
// then we'll "stand in"
|
||||
try
|
||||
{
|
||||
if (config.Configs["Chat"] == null)
|
||||
if (configSource.Configs["Chat"] == null)
|
||||
{
|
||||
// if Chat module has not been configured it's
|
||||
// enabled by default, so we are not going to
|
||||
|
@ -100,7 +100,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
|
|||
}
|
||||
else
|
||||
{
|
||||
m_replacingChatModule = !config.Configs["Chat"].GetBoolean("enabled", true);
|
||||
m_replacingChatModule = !configSource.Configs["Chat"].GetBoolean("enabled", true);
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
|
@ -111,21 +111,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
|
|||
m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing");
|
||||
|
||||
// take note of concierge channel and of identity
|
||||
m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel);
|
||||
m_whoami = m_config.GetString("whoami", "conferencier");
|
||||
m_welcomes = m_config.GetString("welcomes", m_welcomes);
|
||||
m_announceEntering = m_config.GetString("announce_entering", m_announceEntering);
|
||||
m_announceLeaving = m_config.GetString("announce_leaving", m_announceLeaving);
|
||||
m_xmlRpcPassword = m_config.GetString("password", m_xmlRpcPassword);
|
||||
m_brokerURI = m_config.GetString("broker", m_brokerURI);
|
||||
m_brokerUpdateTimeout = m_config.GetInt("broker_timeout", m_brokerUpdateTimeout);
|
||||
m_conciergeChannel = configSource.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel);
|
||||
m_whoami = config.GetString("whoami", "conferencier");
|
||||
m_welcomes = config.GetString("welcomes", m_welcomes);
|
||||
m_announceEntering = config.GetString("announce_entering", m_announceEntering);
|
||||
m_announceLeaving = config.GetString("announce_leaving", m_announceLeaving);
|
||||
m_xmlRpcPassword = config.GetString("password", m_xmlRpcPassword);
|
||||
m_brokerURI = config.GetString("broker", m_brokerURI);
|
||||
m_brokerUpdateTimeout = config.GetInt("broker_timeout", m_brokerUpdateTimeout);
|
||||
|
||||
m_log.InfoFormat("[Concierge] reporting as \"{0}\" to our users", m_whoami);
|
||||
|
||||
// calculate regions Regex
|
||||
if (m_regions == null)
|
||||
{
|
||||
string regions = m_config.GetString("regions", String.Empty);
|
||||
string regions = config.GetString("regions", String.Empty);
|
||||
if (!String.IsNullOrEmpty(regions))
|
||||
{
|
||||
m_regions = new Regex(@regions, RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
||||
|
|
Loading…
Reference in New Issue