OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

try fix IRC connector issue on mantis 7731 but with code a bit diferent from proposed patch. Also append '@irc' to nick on region messages, so message origin is clear

avinationmerge
UbitUmarov 2015-10-26 18:00:01 +00:00
parent 8d33ab903b
commit 8922d58f05
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
View File

@ -368,11 +368,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
m_writer.Flush(); m_writer.Flush();
m_writer.WriteLine(m_user); m_writer.WriteLine(m_user);
m_writer.Flush(); m_writer.Flush();
m_writer.WriteLine(String.Format("JOIN {0}", m_ircChannel));
m_writer.Flush();
m_log.InfoFormat("[IRC-Connector-{0}]: {1} has asked to join {2}", idn, m_nick, m_ircChannel);
} }
catch (Exception e) catch (Exception e)
{ {
@ -521,7 +516,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
c.Message = data["msg"]; c.Message = data["msg"];
c.Type = ChatTypeEnum.Region; c.Type = ChatTypeEnum.Region;
c.Position = CenterOfRegion; c.Position = CenterOfRegion;
c.From = data["nick"]; c.From = data["nick"] + "@IRC";
c.Sender = null; c.Sender = null;
c.SenderUUID = UUID.Zero; c.SenderUUID = UUID.Zero;
@ -659,6 +654,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
version = commArgs[2]; version = commArgs[2];
usermod = commArgs[3]; usermod = commArgs[3];
chanmod = commArgs[4]; chanmod = commArgs[4];
m_writer.WriteLine(String.Format("JOIN {0}", m_ircChannel));
m_writer.Flush();
m_log.InfoFormat("[IRC-Connector-{0}]: sent request to join {1} ", idn, m_ircChannel);
break; break;
case "005": // Server information case "005": // Server information
break; break;
@ -721,11 +721,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
case "PONG": case "PONG":
break; break;
case "JOIN": case "JOIN":
if (m_pending)
{
m_log.InfoFormat("[IRC-Connector-{0}] [{1}] Connected", idn, cmd);
m_pending = false;
}
m_log.DebugFormat("[IRC-Connector-{0}] [{1}] parms = <{2}>", idn, cmd, parms); m_log.DebugFormat("[IRC-Connector-{0}] [{1}] parms = <{2}>", idn, cmd, parms);
eventIrcJoin(pfx, cmd, parms); eventIrcJoin(pfx, cmd, parms);
break; break;
@ -767,7 +763,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
if (IrcChannel.StartsWith(":")) if (IrcChannel.StartsWith(":"))
IrcChannel = IrcChannel.Substring(1); IrcChannel = IrcChannel.Substring(1);
m_log.DebugFormat("[IRC-Connector-{0}] Event: IRCJoin {1}:{2}", idn, m_server, m_ircChannel); if(IrcChannel == m_ircChannel)
{
m_log.InfoFormat("[IRC-Connector-{0}] Joined requested channel {1} at {2}", idn, IrcChannel,m_server);
m_pending = false;
}
else
m_log.InfoFormat("[IRC-Connector-{0}] Joined unknown channel {1} at {2}", idn, IrcChannel,m_server);
BroadcastSim(IrcUser, "/me joins {0}", IrcChannel); BroadcastSim(IrcUser, "/me joins {0}", IrcChannel);
} }