* 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.

3 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 028544e..fe20e99 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         {
             //type for whisper is 0
             World.SimChat(Helpers.StringToField(text),
-                          0, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
+                          0, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
         }
 
         public void llSay(int channelID, string text)
@@ -176,14 +176,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
             //type for say is 1
 
             World.SimChat(Helpers.StringToField(text),
-                           1, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
+                           1, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
         }
 
         public void llShout(int channelID, string text)
         {
             //type for shout is 2
             World.SimChat(Helpers.StringToField(text),
-                          2, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
+                          2, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
         }
 
         public int llListen(int channelID, string name, string ID, string msg) { return 0; }
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 955e978..aa36ea2 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                                         IScriptHost m_host = m_ScriptEngine.World.GetSceneObjectPart(QIS.localID);
                                     //if (m_host != null)
                                     //{
-                                        m_ScriptEngine.World.SimChat(Helpers.StringToField(text), 1, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
+                                        m_ScriptEngine.World.SimChat(Helpers.StringToField(text), 1, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
                                     } catch {
                                     //}
                                     //else
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index f731cb4..c521d47 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -310,7 +310,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                     string text = "Error compiling script:\r\n" + e.Message.ToString();
                     if (text.Length > 1500)
                         text = text.Substring(0, 1500);
-                    World.SimChat(Helpers.StringToField(text), 1, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
+                    World.SimChat(Helpers.StringToField(text), 1, 0, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
                 }
                 catch (Exception e2)
                 {