Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032, reversing
changes made to 619c39e514.
This commit is contained in:
teravus
2012-11-15 10:05:16 -05:00
parent dfac269032
commit e9153e1d1a
337 changed files with 13243 additions and 31060 deletions

View File

@@ -891,10 +891,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
public void Close()
{
Close(true, false);
Close(true);
}
public void Close(bool sendStop, bool force)
public void Close(bool sendStop)
{
Disconnect();
}
@@ -959,8 +959,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
public void SendChatMessage(
string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, UUID ownerID, byte source, byte audible)
public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible)
{
if (audible > 0 && message.Length > 0)
IRC_SendChannelPrivmsg(fromName, message);