aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-09 01:16:42 +0000
committerMelanie Thielker2008-11-09 01:16:42 +0000
commitbdf9add8d1191b08bdaa9706484ac5da1f91af52 (patch)
treeae0a9c0ffb4dabd78a7286a73423a2c6dc4e0e2b /OpenSim/Region/Environment/Modules
parentMantis#2591. Thank you kindly, Ruud Lathrop for a patch that: (diff)
downloadopensim-SC_OLD-bdf9add8d1191b08bdaa9706484ac5da1f91af52.zip
opensim-SC_OLD-bdf9add8d1191b08bdaa9706484ac5da1f91af52.tar.gz
opensim-SC_OLD-bdf9add8d1191b08bdaa9706484ac5da1f91af52.tar.bz2
opensim-SC_OLD-bdf9add8d1191b08bdaa9706484ac5da1f91af52.tar.xz
Reintroduce transactionID to the parameter list for SendInstantMessage.
It is required by group IM and also for a proper implementation of item give, group notice attachments and offline IM.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs4
-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, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index a673f7b..eb82ad7 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
162 { 162 {
163 user.ControllingClient.SendInstantMessage(fromAgentID, message, 163 user.ControllingClient.SendInstantMessage(fromAgentID, message,
164 toAgentID, fromAgentName, dialog, 164 toAgentID, fromAgentName, dialog,
165 timestamp, fromGroup, binaryBucket); 165 timestamp, UUID.Zero, fromGroup, binaryBucket);
166 // Message sent 166 // Message sent
167 return; 167 return;
168 } 168 }
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
179 179
180 user.ControllingClient.SendInstantMessage(fromAgentID, message, 180 user.ControllingClient.SendInstantMessage(fromAgentID, message,
181 toAgentID, fromAgentName, dialog, 181 toAgentID, fromAgentName, dialog,
182 timestamp, fromGroup, binaryBucket); 182 timestamp, UUID.Zero, fromGroup, binaryBucket);
183 // Message sent 183 // Message sent
184 return; 184 return;
185 } 185 }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d8b203f..b134591 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
136 136
137 user.ControllingClient.SendInstantMessage( 137 user.ControllingClient.SendInstantMessage(
138 fromAgentID, message, toAgentID, fromAgentName, 138 fromAgentID, message, toAgentID, fromAgentName,
139 dialog, timestamp, false, binaryBucket); 139 dialog, timestamp, UUID.Zero, false, binaryBucket);
140 140
141 return; 141 return;
142 } 142 }
@@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
168 { 168 {
169 user.ControllingClient.SendInstantMessage( 169 user.ControllingClient.SendInstantMessage(
170 fromAgentID, message, toAgentID, fromAgentName, 170 fromAgentID, message, toAgentID, fromAgentName,
171 dialog, timestamp, false, binaryBucket); 171 dialog, timestamp, UUID.Zero, false, binaryBucket);
172 172
173 if (m_pendingOffers.ContainsKey(imSessionID)) 173 if (m_pendingOffers.ContainsKey(imSessionID))
174 { 174 {
@@ -214,7 +214,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
214 { 214 {
215 user.ControllingClient.SendInstantMessage( 215 user.ControllingClient.SendInstantMessage(
216 fromAgentID, message, toAgentID, fromAgentName, 216 fromAgentID, message, toAgentID, fromAgentName,
217 dialog, timestamp, false, binaryBucket); 217 dialog, timestamp, UUID.Zero, false, binaryBucket);
218 218
219 if (m_pendingOffers.ContainsKey(imSessionID)) 219 if (m_pendingOffers.ContainsKey(imSessionID))
220 { 220 {
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 155a01b..cf8ba94 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -476,7 +476,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
476 476
477 } 477 }
478 478
479 public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, bool fromGroup, byte[] binaryBucket) 479 public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, UUID transationID, bool fromGroup, byte[] binaryBucket)
480 { 480 {
481 481
482 } 482 }