aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs6
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
3 files changed, 6 insertions, 5 deletions
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
117 = ((dialog == 38) || (dialog == 39) || (dialog == 40) 117 = ((dialog == 38) || (dialog == 39) || (dialog == 40)
118 || dialog == (byte) InstantMessageDialog.InventoryOffered 118 || dialog == (byte) InstantMessageDialog.InventoryOffered
119 || dialog == (byte) InstantMessageDialog.InventoryAccepted 119 || dialog == (byte) InstantMessageDialog.InventoryAccepted
120 || dialog == (byte) InstantMessageDialog.InventoryDeclined); 120 || dialog == (byte) InstantMessageDialog.InventoryDeclined
121 || dialog == (byte) InstantMessageDialog.GroupNotice);
121 122
122 // IM dialogs need to be pre-processed and have their sessionID filled by the server 123 // IM dialogs need to be pre-processed and have their sessionID filled by the server
123 // so the sim can match the transaction on the return packet. 124 // 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
127 127
128 user.ControllingClient.SendInstantMessage( 128 user.ControllingClient.SendInstantMessage(
129 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 129 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
130 dialog, timestamp, binaryBucket); 130 dialog, timestamp, false, binaryBucket);
131 131
132 return; 132 return;
133 } 133 }
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
159 { 159 {
160 user.ControllingClient.SendInstantMessage( 160 user.ControllingClient.SendInstantMessage(
161 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 161 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
162 dialog, timestamp, binaryBucket); 162 dialog, timestamp, false, binaryBucket);
163 163
164 if (m_pendingOffers.ContainsKey(imSessionID)) 164 if (m_pendingOffers.ContainsKey(imSessionID))
165 { 165 {
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
205 { 205 {
206 user.ControllingClient.SendInstantMessage( 206 user.ControllingClient.SendInstantMessage(
207 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName, 207 fromAgentID, fromAgentSession, message, toAgentID, imSessionID, fromAgentName,
208 dialog, timestamp, binaryBucket); 208 dialog, timestamp, false, binaryBucket);
209 209
210 if (m_pendingOffers.ContainsKey(imSessionID)) 210 if (m_pendingOffers.ContainsKey(imSessionID))
211 { 211 {
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
478 478
479 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent, 479 public virtual void SendInstantMessage(UUID fromAgent, UUID fromAgentSession, string message, UUID toAgent,
480 UUID imSessionID, string fromName, byte dialog, uint timeStamp, 480 UUID imSessionID, string fromName, byte dialog, uint timeStamp,
481 byte[] binaryBucket) 481 bool fromGroup, byte[] binaryBucket)
482 { 482 {
483 } 483 }
484 484