diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index 2fcc477..0d6313a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -80,16 +80,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
80 | m_config = config.Configs["Concierge"]; | 80 | m_config = config.Configs["Concierge"]; |
81 | 81 | ||
82 | if (null == m_config) | 82 | if (null == m_config) |
83 | { | ||
84 | m_log.Info("[Concierge]: no config found, plugin disabled"); | ||
85 | return; | 83 | return; |
86 | } | ||
87 | 84 | ||
88 | if (!m_config.GetBoolean("enabled", false)) | 85 | if (!m_config.GetBoolean("enabled", false)) |
89 | { | ||
90 | m_log.Info("[Concierge]: plugin disabled by configuration"); | ||
91 | return; | 86 | return; |
92 | } | 87 | |
93 | m_enabled = true; | 88 | m_enabled = true; |
94 | 89 | ||
95 | 90 | ||
@@ -113,9 +108,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
113 | { | 108 | { |
114 | m_replacingChatModule = false; | 109 | m_replacingChatModule = false; |
115 | } | 110 | } |
111 | |||
116 | m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing"); | 112 | m_log.InfoFormat("[Concierge] {0} ChatModule", m_replacingChatModule ? "replacing" : "not replacing"); |
117 | 113 | ||
118 | |||
119 | // take note of concierge channel and of identity | 114 | // take note of concierge channel and of identity |
120 | m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel); | 115 | m_conciergeChannel = config.Configs["Concierge"].GetInt("concierge_channel", m_conciergeChannel); |
121 | m_whoami = m_config.GetString("whoami", "conferencier"); | 116 | m_whoami = m_config.GetString("whoami", "conferencier"); |