From f8ddf7429eaeae3a3aae88d4560473c3516d20fd Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 14 Sep 2007 13:46:05 +0000
Subject: * Wired up chat so that channel goes into OnChatFromViewer. However: 
  * There's no libsl reply packet field for it, I guess other channels than 0
 makes no sense sending back to clients.   * We do not currently support
 objects listening, so there's really no way of actually using this feature.
 So; somebody please wire chat all the way to the scripts.

---
 OpenSim/Region/ClientStack/ClientView.API.cs            | 9 +--------
 OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 5 ++++-
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

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
             SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID);
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="type"></param>
-        /// <param name="fromPos"></param>
-        /// <param name="fromName"></param>
-        /// <param name="fromAgentID"></param>
+
         public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
         {
             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
                         byte type = inchatpack.ChatData.Type;
                         LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
                         LLUUID fromAgentID = AgentID;
+
+                        int channel = inchatpack.ChatData.Channel;
+
                         if (OnChatFromViewer != null)
                         {
-                            this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
+                            this.OnChatFromViewer(message, type, channel, fromPos, fromName, fromAgentID);
                         }
                         break;
                     case PacketType.ImprovedInstantMessage:
-- 
cgit v1.1