From d262fb56509028ff23c0037fb28c93811e55d00d Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Mon, 14 Jul 2008 09:16:07 +0000
Subject: adds a default value of true to the new IRC bridge configuration
 option "nicknum" to provide backwards compatibility for existing OpenSim.ini
 files

---
 OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
index 9240e5a..2977009 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs
@@ -400,6 +400,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
             // [IRC]
             // server  = chat.freenode.net
             // nick    = OSimBot_mysim
+            // nicknum = true
+            // ;nicknum set to true appends a 2 digit random number to the nick
             // ;username = USER OpenSimBot 8 * :I'm a OpenSim to irc bot
             // ; username is the IRC command line sent
             // ; USER <irc_user> <visible=8,invisible=0> * : <IRC_realname>
@@ -422,7 +424,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
                 m_server = config.Configs["IRC"].GetString("server");
                 m_nick = config.Configs["IRC"].GetString("nick");
                 m_basenick = m_nick;
-                m_nrnick = config.Configs["IRC"].GetBoolean("nicknum");
+                m_nrnick = config.Configs["IRC"].GetBoolean("nicknum", true);
                 m_channel = config.Configs["IRC"].GetString("channel");
                 m_port = (uint)config.Configs["IRC"].GetInt("port", (int)m_port);
                 m_user = config.Configs["IRC"].GetString("username", m_user);
@@ -436,9 +438,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
                     m_enabled = true;
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
-                m_log.Info("[CHAT]: No IRC config information, skipping IRC bridge configuration");
+                m_log.Info("[CHAT]: Incomplete IRC config information, skipping IRC bridge configuration");
             }
         }
 
-- 
cgit v1.1