diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs index 031e50a..c97ba37 100644 --- a/OpenSim/Region/ClientStack/ClientView.API.cs +++ b/OpenSim/Region/ClientStack/ClientView.API.cs | |||
@@ -243,14 +243,7 @@ namespace OpenSim.Region.ClientStack | |||
243 | SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID); | 243 | SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID); |
244 | } | 244 | } |
245 | 245 | ||
246 | /// <summary> | 246 | |
247 | /// | ||
248 | /// </summary> | ||
249 | /// <param name="message"></param> | ||
250 | /// <param name="type"></param> | ||
251 | /// <param name="fromPos"></param> | ||
252 | /// <param name="fromName"></param> | ||
253 | /// <param name="fromAgentID"></param> | ||
254 | public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) | 247 | public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) |
255 | { | 248 | { |
256 | Encoding enc = Encoding.ASCII; | 249 | Encoding enc = Encoding.ASCII; |
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs index fab5433..fe3e82c 100644 --- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs +++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | |||
@@ -107,9 +107,12 @@ namespace OpenSim.Region.ClientStack | |||
107 | byte type = inchatpack.ChatData.Type; | 107 | byte type = inchatpack.ChatData.Type; |
108 | LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; | 108 | LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos; |
109 | LLUUID fromAgentID = AgentID; | 109 | LLUUID fromAgentID = AgentID; |
110 | |||
111 | int channel = inchatpack.ChatData.Channel; | ||
112 | |||
110 | if (OnChatFromViewer != null) | 113 | if (OnChatFromViewer != null) |
111 | { | 114 | { |
112 | this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID); | 115 | this.OnChatFromViewer(message, type, channel, fromPos, fromName, fromAgentID); |
113 | } | 116 | } |
114 | break; | 117 | break; |
115 | case PacketType.ImprovedInstantMessage: | 118 | case PacketType.ImprovedInstantMessage: |