cleaning up: coding style guidelines violation in RestPlugin.cs.

adding support for enabled = true|false for IRCBridgeModule

2 files changed, 25 insertions, 1 deletions

diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index c502e28..9855658 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -194,7 +194,8 @@ namespace OpenSim.ApplicationPlugins.Rest
 
             try
             {
-                if ((_config = openSim.ConfigSource.Configs["RestPlugins"]) == null) {
+                if ((_config = openSim.ConfigSource.Configs["RestPlugins"]) == null) 
+                {
                     m_log.WarnFormat("{0} Rest Plugins not configured", MsgID);
                     return;
                 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index a31d620..156c2fd 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
@@ -60,12 +60,35 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
         internal object m_syncInit = new object();
         internal object m_syncLogout = new object();
 
+        private IConfig m_config;
+
         #region IRegionModule Members
 
         public void Initialise(Scene scene, IConfigSource config)
         {
+            try
+            {
+                if ((m_config = config.Configs["IRC"]) == null) 
+                {
+                    m_log.InfoFormat("[IRC] module not configured");
+                    return;
+                }
+
+                if (!m_config.GetBoolean("enabled", false))
+                {
+                    m_log.InfoFormat("[IRC] module disabled in configuration");
+                    return;
+                }
+            }
+            catch (Exception)
+            {
+                m_log.Info("[IRC] module not configured");
+                return;
+            }
+
             lock (m_syncInit)
             {
+
                 if (!m_scenes.Contains(scene))
                 {
                     m_scenes.Add(scene);