From add42f5e9b2d58a4978d4aab4440d5cc2d255a12 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Mon, 3 Nov 2008 17:17:57 +0000 Subject: completing move to refactored multi-channel capable IRCBridgeModule --- .../Region/Environment/Modules/Avatar/Chat/ChannelState.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs') diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs index f9089cb..4fc744b 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChannelState.cs @@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat // IRC connector reference - internal XIRCConnector irc = null; + internal IRCConnector irc = null; internal int idn = _idk_++; @@ -256,7 +256,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat // values that, while independent of the IRC connetion, do still distinguish // this region's behavior. - foreach (ChannelState xcs in XIRCBridgeModule.m_channels) + foreach (ChannelState xcs in IRCBridgeModule.m_channels) { if (cs.IsAPerfectMatchFor(xcs)) { @@ -279,9 +279,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat m_log.DebugFormat("[IRC-Channel-{0}] New channel required", cs.idn); - if ((cs.irc = new XIRCConnector(cs)) != null) + if ((cs.irc = new IRCConnector(cs)) != null) { - XIRCBridgeModule.m_channels.Add(cs); + IRCBridgeModule.m_channels.Add(cs); m_log.InfoFormat("[IRC-Channel-{0}] New channel initialized for {1}, nick: {2}, commands {3}, private channels {4}", cs.idn, rs.Region, cs.DefaultZone, @@ -554,7 +554,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat // contains information that is not differentiating from an // IRC point-of-view. - public static void OSChat(XIRCConnector p_irc, OSChatMessage c, bool cmsg) + public static void OSChat(IRCConnector p_irc, OSChatMessage c, bool cmsg) { // m_log.DebugFormat("[IRC-OSCHAT] from {0}:{1}", p_irc.Server, p_irc.IrcChannel); @@ -568,7 +568,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat // Note that this code is responsible for completing some of the // settings for the inbound OSChatMessage - foreach (ChannelState cs in XIRCBridgeModule.m_channels) + foreach (ChannelState cs in IRCBridgeModule.m_channels) { if ( p_irc == cs.irc) { -- cgit v1.1