aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/Chat
diff options
context:
space:
mode:
authorDahlia Trimble2008-07-14 09:16:07 +0000
committerDahlia Trimble2008-07-14 09:16:07 +0000
commitd262fb56509028ff23c0037fb28c93811e55d00d (patch)
treeaa8a83abb7503e1a58a078d552008960d4d7a9bb /OpenSim/Region/Environment/Modules/Avatar/Chat
parentUpdate svn properties. (diff)
downloadopensim-SC_OLD-d262fb56509028ff23c0037fb28c93811e55d00d.zip
opensim-SC_OLD-d262fb56509028ff23c0037fb28c93811e55d00d.tar.gz
opensim-SC_OLD-d262fb56509028ff23c0037fb28c93811e55d00d.tar.bz2
opensim-SC_OLD-d262fb56509028ff23c0037fb28c93811e55d00d.tar.xz
adds a default value of true to the new IRC bridge configuration option "nicknum" to provide backwards compatibility for existing OpenSim.ini files
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Chat')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/IRCBridgeModule.cs8
1 files changed, 5 insertions, 3 deletions
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
400 // [IRC] 400 // [IRC]
401 // server = chat.freenode.net 401 // server = chat.freenode.net
402 // nick = OSimBot_mysim 402 // nick = OSimBot_mysim
403 // nicknum = true
404 // ;nicknum set to true appends a 2 digit random number to the nick
403 // ;username = USER OpenSimBot 8 * :I'm a OpenSim to irc bot 405 // ;username = USER OpenSimBot 8 * :I'm a OpenSim to irc bot
404 // ; username is the IRC command line sent 406 // ; username is the IRC command line sent
405 // ; USER <irc_user> <visible=8,invisible=0> * : <IRC_realname> 407 // ; USER <irc_user> <visible=8,invisible=0> * : <IRC_realname>
@@ -422,7 +424,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
422 m_server = config.Configs["IRC"].GetString("server"); 424 m_server = config.Configs["IRC"].GetString("server");
423 m_nick = config.Configs["IRC"].GetString("nick"); 425 m_nick = config.Configs["IRC"].GetString("nick");
424 m_basenick = m_nick; 426 m_basenick = m_nick;
425 m_nrnick = config.Configs["IRC"].GetBoolean("nicknum"); 427 m_nrnick = config.Configs["IRC"].GetBoolean("nicknum", true);
426 m_channel = config.Configs["IRC"].GetString("channel"); 428 m_channel = config.Configs["IRC"].GetString("channel");
427 m_port = (uint)config.Configs["IRC"].GetInt("port", (int)m_port); 429 m_port = (uint)config.Configs["IRC"].GetInt("port", (int)m_port);
428 m_user = config.Configs["IRC"].GetString("username", m_user); 430 m_user = config.Configs["IRC"].GetString("username", m_user);
@@ -436,9 +438,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
436 m_enabled = true; 438 m_enabled = true;
437 } 439 }
438 } 440 }
439 catch (Exception) 441 catch (Exception e)
440 { 442 {
441 m_log.Info("[CHAT]: No IRC config information, skipping IRC bridge configuration"); 443 m_log.Info("[CHAT]: Incomplete IRC config information, skipping IRC bridge configuration");
442 } 444 }
443 } 445 }
444 446