aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar/InstantMessage
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/Avatar/InstantMessage
parentMantis#2591. Thank you kindly, Ruud Lathrop for a patch that: (diff)
downloadopensim-SC-bdf9add8d1191b08bdaa9706484ac5da1f91af52.zip
opensim-SC-bdf9add8d1191b08bdaa9706484ac5da1f91af52.tar.gz
opensim-SC-bdf9add8d1191b08bdaa9706484ac5da1f91af52.tar.bz2
opensim-SC-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/Avatar/InstantMessage')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs4
1 files changed, 2 insertions, 2 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 }