aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs19
1 files changed, 3 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 2a0f97d..e5a4101 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
52 /// Handles new client connections 52 /// Handles new client connections
53 /// Constructor takes a single Packet and authenticates everything 53 /// Constructor takes a single Packet and authenticates everything
54 /// </summary> 54 /// </summary>
55 public class LLClientView : IClientAPI, IClientCore, IClientIM 55 public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat
56 { 56 {
57 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 57 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
58 58
@@ -1046,26 +1046,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1046 OutPacket(mov, ThrottleOutPacketType.Unknown); 1046 OutPacket(mov, ThrottleOutPacketType.Unknown);
1047 } 1047 }
1048 1048
1049 /// <summary>
1050 ///
1051 /// </summary>
1052 /// <param name="message"></param>
1053 /// <param name="type"></param>
1054 /// <param name="fromPos"></param>
1055 /// <param name="fromName"></param>
1056 /// <param name="fromAgentID"></param>
1057 public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, 1049 public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName,
1058 UUID fromAgentID, byte source, byte audible) 1050 UUID fromAgentID, byte source, byte audible)
1059 { 1051 {
1060 SendChatMessage(Utils.StringToBytes(message), type, fromPos, fromName, fromAgentID, source, audible);
1061 }
1062
1063 public void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName,
1064 UUID fromAgentID, byte source, byte audible)
1065 {
1066 ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator); 1052 ChatFromSimulatorPacket reply = (ChatFromSimulatorPacket)PacketPool.Instance.GetPacket(PacketType.ChatFromSimulator);
1067 reply.ChatData.Audible = audible; 1053 reply.ChatData.Audible = audible;
1068 reply.ChatData.Message = message; 1054 reply.ChatData.Message = Utils.StringToBytes(message);
1069 reply.ChatData.ChatType = type; 1055 reply.ChatData.ChatType = type;
1070 reply.ChatData.SourceType = source; 1056 reply.ChatData.SourceType = source;
1071 reply.ChatData.Position = fromPos; 1057 reply.ChatData.Position = fromPos;
@@ -7678,6 +7664,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
7678 protected virtual void RegisterInterfaces() 7664 protected virtual void RegisterInterfaces()
7679 { 7665 {
7680 RegisterInterface<IClientIM>(this); 7666 RegisterInterface<IClientIM>(this);
7667 RegisterInterface<IClientChat>(this);
7681 } 7668 }
7682 7669
7683 public bool TryGet<T>(out T iface) 7670 public bool TryGet<T>(out T iface)