diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
3 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index e93bd7c..781539a 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -954,7 +954,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
954 | 954 | ||
955 | } | 955 | } |
956 | 956 | ||
957 | public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible) | 957 | public void SendChatMessage( |
958 | string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, UUID ownerID, byte source, byte audible) | ||
958 | { | 959 | { |
959 | if (audible > 0 && message.Length > 0) | 960 | if (audible > 0 && message.Length > 0) |
960 | IRC_SendChannelPrivmsg(fromName, message); | 961 | IRC_SendChannelPrivmsg(fromName, message); |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs index e22618d..5c3be29 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs | |||
@@ -546,8 +546,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge | |||
546 | c.SenderUUID = UUID.Zero; | 546 | c.SenderUUID = UUID.Zero; |
547 | c.Scene = agent.Scene; | 547 | c.Scene = agent.Scene; |
548 | 548 | ||
549 | agent.ControllingClient.SendChatMessage(msg, (byte) ChatTypeEnum.Say, PosOfGod, m_whoami, UUID.Zero, | 549 | agent.ControllingClient.SendChatMessage( |
550 | (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); | 550 | msg, (byte) ChatTypeEnum.Say, PosOfGod, m_whoami, UUID.Zero, UUID.Zero, |
551 | (byte)ChatSourceType.Object, (byte)ChatAudibleLevel.Fully); | ||
551 | } | 552 | } |
552 | 553 | ||
553 | private static void checkStringParameters(XmlRpcRequest request, string[] param) | 554 | private static void checkStringParameters(XmlRpcRequest request, string[] param) |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index ffd4222..5ea2bcd 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -603,13 +603,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
603 | { | 603 | { |
604 | } | 604 | } |
605 | 605 | ||
606 | public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, | 606 | public virtual void SendChatMessage( |
607 | UUID fromAgentID, byte source, byte audible) | 607 | string message, byte type, Vector3 fromPos, string fromName, |
608 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | ||
608 | { | 609 | { |
609 | } | 610 | } |
610 | 611 | ||
611 | public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName, | 612 | public virtual void SendChatMessage( |
612 | UUID fromAgentID, byte source, byte audible) | 613 | byte[] message, byte type, Vector3 fromPos, string fromName, |
614 | UUID fromAgentID, UUID ownerID, byte source, byte audible) | ||
613 | { | 615 | { |
614 | } | 616 | } |
615 | 617 | ||