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

---
 .../Modules/Avatar/InstantMessage/InstantMessageModule.cs           | 3 ++-
 .../Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs    | 6 +++---
 OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs           | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules')

diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 9312fd8..3e45f7f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -117,7 +117,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
                 = ((dialog == 38) || (dialog == 39) || (dialog == 40)
                    || dialog == (byte) InstantMessageDialog.InventoryOffered
                    || dialog == (byte) InstantMessageDialog.InventoryAccepted
-                   || dialog == (byte) InstantMessageDialog.InventoryDeclined);
+                   || dialog == (byte) InstantMessageDialog.InventoryDeclined
+                   || dialog == (byte) InstantMessageDialog.GroupNotice);
 
             // IM dialogs need to be pre-processed and have their sessionID filled by the server
             // so the sim can match the transaction on the return packet.
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index ed58338..b18fb5d 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
 
                         user.ControllingClient.SendInstantMessage(
                             fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
-                            dialog, timestamp, binaryBucket);
+                            dialog, timestamp, false, binaryBucket);
 
                         return;
                     }
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
                     {
                         user.ControllingClient.SendInstantMessage(
                             fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
-                            dialog, timestamp, binaryBucket);
+                            dialog, timestamp, false, binaryBucket);
 
                         if (m_pendingOffers.ContainsKey(imSessionID))
                         {
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
                     {
                         user.ControllingClient.SendInstantMessage(
                             fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
-                            dialog, timestamp, binaryBucket);
+                            dialog, timestamp, false, binaryBucket);
 
                         if (m_pendingOffers.ContainsKey(imSessionID))
                         {
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index e2b035a..5c22bb1 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -478,7 +478,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
 
         public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
                                                UUID imSessionID, string fromName, byte dialog, uint timeStamp,
-                                               byte[] binaryBucket)
+                                               bool fromGroup, byte[] binaryBucket)
         {
         }
 
-- 
cgit v1.1