aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
diff options
context:
space:
mode:
authorDr Scofield2008-11-06 13:13:08 +0000
committerDr Scofield2008-11-06 13:13:08 +0000
commit09f86d7e99a4c577a2f6e2c650ad430a45c86aca (patch)
treecc3d8774c7256c0a08e6c65aba92f5cb55ceb0bf /OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
parentFrom: Christopher Yeoh <cyeoh@au1.ibm.com> (diff)
downloadopensim-SC_OLD-09f86d7e99a4c577a2f6e2c650ad430a45c86aca.zip
opensim-SC_OLD-09f86d7e99a4c577a2f6e2c650ad430a45c86aca.tar.gz
opensim-SC_OLD-09f86d7e99a4c577a2f6e2c650ad430a45c86aca.tar.bz2
opensim-SC_OLD-09f86d7e99a4c577a2f6e2c650ad430a45c86aca.tar.xz
- fixes comparison of struct against null (no no no)
- fixes IRCBridgeModule's XmlRpc method really paying attention to region parameter - cleans up indentation in IRCBridge code - fixes ConciergeModule exception on client logout
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
index 4fc744b..6265698 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs
@@ -486,10 +486,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
486 { 486 {
487 487
488 m_log.InfoFormat("[IRC-Channel-{0}] Closing channel <{1} to server <{2}:{3}>", 488 m_log.InfoFormat("[IRC-Channel-{0}] Closing channel <{1} to server <{2}:{3}>",
489 idn, IrcChannel, Server, Port); 489 idn, IrcChannel, Server, Port);
490 490
491 m_log.InfoFormat("[IRC-Channel-{0}] There are {1} active clients", 491 m_log.InfoFormat("[IRC-Channel-{0}] There are {1} active clients",
492 idn, clientregions.Count); 492 idn, clientregions.Count);
493 493
494 irc.Close(); 494 irc.Close();
495 495
@@ -498,7 +498,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
498 public void Open() 498 public void Open()
499 { 499 {
500 m_log.InfoFormat("[IRC-Channel-{0}] Opening channel <{1} to server <{2}:{3}>", 500 m_log.InfoFormat("[IRC-Channel-{0}] Opening channel <{1} to server <{2}:{3}>",
501 idn, IrcChannel, Server, Port); 501 idn, IrcChannel, Server, Port);
502 502
503 irc.Open(); 503 irc.Open();
504 504
@@ -524,7 +524,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
524 public void AddRegion(RegionState rs) 524 public void AddRegion(RegionState rs)
525 { 525 {
526 m_log.InfoFormat("[IRC-Channel-{0}] Adding region {1} to channel <{2} to server <{3}:{4}>", 526 m_log.InfoFormat("[IRC-Channel-{0}] Adding region {1} to channel <{2} to server <{3}:{4}>",
527 idn, rs.Region, IrcChannel, Server, Port); 527 idn, rs.Region, IrcChannel, Server, Port);
528 if (!clientregions.Contains(rs)) 528 if (!clientregions.Contains(rs))
529 { 529 {
530 clientregions.Add(rs); 530 clientregions.Add(rs);
@@ -540,7 +540,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
540 { 540 {
541 541
542 m_log.InfoFormat("[IRC-Channel-{0}] Removing region {1} from channel <{2} to server <{3}:{4}>", 542 m_log.InfoFormat("[IRC-Channel-{0}] Removing region {1} from channel <{2} to server <{3}:{4}>",
543 idn, rs.Region, IrcChannel, Server, Port); 543 idn, rs.Region, IrcChannel, Server, Port);
544 544
545 if (clientregions.Contains(rs)) 545 if (clientregions.Contains(rs))
546 { 546 {