diff options
author | Melanie Thielker | 2016-11-22 11:47:50 +0000 |
---|---|---|
committer | Melanie Thielker | 2016-11-22 11:47:50 +0000 |
commit | b43717a39721adf14cb84d9d43055036b605a060 (patch) | |
tree | 96a52f285a099d28798614c0b5803005c0f5b746 /OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |
parent | supress some warnings by explict(confirm) the hide of parent fields (diff) | |
download | opensim-SC_OLD-b43717a39721adf14cb84d9d43055036b605a060.zip opensim-SC_OLD-b43717a39721adf14cb84d9d43055036b605a060.tar.gz opensim-SC_OLD-b43717a39721adf14cb84d9d43055036b605a060.tar.bz2 opensim-SC_OLD-b43717a39721adf14cb84d9d43055036b605a060.tar.xz |
Coding standards: A local variable may not use the prefix m_
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index c4a70c0..6c147f4 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -75,14 +75,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
75 | internal new bool m_enabled = false; | 75 | internal new bool m_enabled = false; |
76 | 76 | ||
77 | #region ISharedRegionModule Members | 77 | #region ISharedRegionModule Members |
78 | public override void Initialise(IConfigSource config) | 78 | public override void Initialise(IConfigSource configSource) |
79 | { | 79 | { |
80 | IConfig m_config = config.Configs["Concierge"]; | 80 | IConfig config = configSource.Configs["Concierge"]; |
81 | 81 | ||
82 | if (null == m_config) | 82 | if (config == null) |
83 | return; | 83 | return; |
84 | 84 | ||
85 | if (!m_config.GetBoolean("enabled", false)) | 85 | if (!config.GetBoolean("enabled", false)) |
86 | return; | 86 | return; |
87 | 87 | ||
88 | m_enabled = true; | 88 | m_enabled = true; |
@@ -91,7 +91,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
91 | // then we'll "stand in" | 91 | // then we'll "stand in" |
92 | try | 92 | try |
93 | { | 93 | { |
94 | if (config.Configs["Chat"] == null) | 94 | if (configSource.Configs["Chat"] == null) |
95 | { | 95 | { |
96 | // if Chat module has not been configured it's | 96 | // if Chat module has not been configured it's |
97 | // enabled by default, so we are not going to | 97 | // enabled by default, so we are not going to |
@@ -100,7 +100,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
100 | } | 100 | } |
101 | else | 101 | else |
102 | { | 102 | { |
103 | m_replacingChatModule = !config.Configs["Chat"].GetBoolean("enabled", true); | 103 | m_replacingChatModule = !configSource.Configs["Chat"].GetBoolean("enabled", true); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | catch (Exception) | 106 | catch (Exception) |
@@ -111,21 +111,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
111 | m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing"); | 111 | m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing"); |
112 | 112 | ||
113 | // take note of concierge channel and of identity | 113 | // take note of concierge channel and of identity |
114 | m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel); | 114 | m_conciergeChannel = configSource.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel); |
115 | m_whoami = m_config.GetString("whoami", "conferencier"); | 115 | m_whoami = config.GetString("whoami", "conferencier"); |
116 | m_welcomes = m_config.GetString("welcomes", m_welcomes); | 116 | m_welcomes = config.GetString("welcomes", m_welcomes); |
117 | m_announceEntering = m_config.GetString("announce_entering", m_announceEntering); | 117 | m_announceEntering = config.GetString("announce_entering", m_announceEntering); |
118 | m_announceLeaving = m_config.GetString("announce_leaving", m_announceLeaving); | 118 | m_announceLeaving = config.GetString("announce_leaving", m_announceLeaving); |
119 | m_xmlRpcPassword = m_config.GetString("password", m_xmlRpcPassword); | 119 | m_xmlRpcPassword = config.GetString("password", m_xmlRpcPassword); |
120 | m_brokerURI = m_config.GetString("broker", m_brokerURI); | 120 | m_brokerURI = config.GetString("broker", m_brokerURI); |
121 | m_brokerUpdateTimeout = m_config.GetInt("broker_timeout", m_brokerUpdateTimeout); | 121 | m_brokerUpdateTimeout = config.GetInt("broker_timeout", m_brokerUpdateTimeout); |
122 | 122 | ||
123 | m_log.InfoFormat("[Concierge] reporting as \"{0}\" to our users", m_whoami); | 123 | m_log.InfoFormat("[Concierge] reporting as \"{0}\" to our users", m_whoami); |
124 | 124 | ||
125 | // calculate regions Regex | 125 | // calculate regions Regex |
126 | if (m_regions == null) | 126 | if (m_regions == null) |
127 | { | 127 | { |
128 | string regions = m_config.GetString("regions", String.Empty); | 128 | string regions = config.GetString("regions", String.Empty); |
129 | if (!String.IsNullOrEmpty(regions)) | 129 | if (!String.IsNullOrEmpty(regions)) |
130 | { | 130 | { |
131 | m_regions = new Regex(@regions, RegexOptions.Compiled | RegexOptions.IgnoreCase); | 131 | m_regions = new Regex(@regions, RegexOptions.Compiled | RegexOptions.IgnoreCase); |