From c49e1b8fb67edb686038e6d200914ed3358bf649 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 25 Oct 2008 13:53:17 +0000
Subject: A few more bots to yesterday's plumbing: change instant message
 method signature

---
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 340472c..d24b54d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1106,7 +1106,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             SendInstantMessage(
                 fromAgent, fromAgentSession, message, toAgent,
-                imSessionID, fromName, dialog, timeStamp, new byte[0]);
+                imSessionID, fromName, dialog, timeStamp, false, new byte[0]);
         }
 
         /// <summary>
@@ -1116,7 +1116,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="target"></param>
         public void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
                                        UUID imSessionID, string fromName, byte dialog, uint timeStamp,
-                                       byte[] binaryBucket)
+                                       bool fromGroup, byte[] binaryBucket)
         {
             if (((Scene)(this.m_scene)).ExternalChecks.ExternalChecksCanInstantMessage(fromAgent, toAgent))
             {
@@ -1127,7 +1127,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 msg.AgentData.SessionID = fromAgentSession;
                 msg.MessageBlock.FromAgentName = Utils.StringToBytes(fromName);
                 msg.MessageBlock.Dialog = dialog;
-                msg.MessageBlock.FromGroup = false;
+                msg.MessageBlock.FromGroup = fromGroup;
                 msg.MessageBlock.ID = imSessionID;
                 msg.MessageBlock.Offline = 0;
                 msg.MessageBlock.ParentEstateID = 0;
@@ -4089,6 +4089,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         break;
                     case PacketType.ImprovedInstantMessage:
                         ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
+Console.WriteLine(msgpack.ToString());
                         string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
                         string IMmessage = Utils.BytesToString(msgpack.MessageBlock.Message);
                         handlerInstantMessage = OnInstantMessage;
-- 
cgit v1.1