OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Coding standards: A local variable may not use the prefix m_

melanie
Melanie Thielker 2016-11-22 11:47:50 +00:00
parent 385a265971
commit b43717a397
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
View File

@ -75,14 +75,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
internal new bool m_enabled = false; internal new bool m_enabled = false;
#region ISharedRegionModule Members #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; return;
if (!m_config.GetBoolean("enabled", false)) if (!config.GetBoolean("enabled", false))
return; return;
m_enabled = true; m_enabled = true;
@ -91,7 +91,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
// then we'll "stand in" // then we'll "stand in"
try try
{ {
if (config.Configs["Chat"] == null) if (configSource.Configs["Chat"] == null)
{ {
// if Chat module has not been configured it's // if Chat module has not been configured it's
// enabled by default, so we are not going to // enabled by default, so we are not going to
@ -100,7 +100,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
} }
else else
{ {
m_replacingChatModule = !config.Configs["Chat"].GetBoolean("enabled", true); m_replacingChatModule = !configSource.Configs["Chat"].GetBoolean("enabled", true);
} }
} }
catch (Exception) catch (Exception)
@ -111,21 +111,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing"); m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing");
// take note of concierge channel and of identity // take note of concierge channel and of identity
m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel); m_conciergeChannel = configSource.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel);
m_whoami = m_config.GetString("whoami", "conferencier"); m_whoami = config.GetString("whoami", "conferencier");
m_welcomes = m_config.GetString("welcomes", m_welcomes); m_welcomes = config.GetString("welcomes", m_welcomes);
m_announceEntering = m_config.GetString("announce_entering", m_announceEntering); m_announceEntering = config.GetString("announce_entering", m_announceEntering);
m_announceLeaving = m_config.GetString("announce_leaving", m_announceLeaving); m_announceLeaving = config.GetString("announce_leaving", m_announceLeaving);
m_xmlRpcPassword = m_config.GetString("password", m_xmlRpcPassword); m_xmlRpcPassword = config.GetString("password", m_xmlRpcPassword);
m_brokerURI = m_config.GetString("broker", m_brokerURI); m_brokerURI = config.GetString("broker", m_brokerURI);
m_brokerUpdateTimeout = m_config.GetInt("broker_timeout", m_brokerUpdateTimeout); m_brokerUpdateTimeout = config.GetInt("broker_timeout", m_brokerUpdateTimeout);
m_log.InfoFormat("[Concierge] reporting as \"{0}\" to our users", m_whoami); m_log.InfoFormat("[Concierge] reporting as \"{0}\" to our users", m_whoami);
// calculate regions Regex // calculate regions Regex
if (m_regions == null) if (m_regions == null)
{ {
string regions = m_config.GetString("regions", String.Empty); string regions = config.GetString("regions", String.Empty);
if (!String.IsNullOrEmpty(regions)) if (!String.IsNullOrEmpty(regions))
{ {
m_regions = new Regex(@regions, RegexOptions.Compiled | RegexOptions.IgnoreCase); m_regions = new Regex(@regions, RegexOptions.Compiled | RegexOptions.IgnoreCase);