Hack to temporarily fix friends-handling. This will be redone as soon as

Melanie's CommunicationModule is in.
Please note: imSession is a transaction-ID, *not* the agent's session.

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 0698b9a..805f7cb 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
                         {
                             user.ControllingClient.SendInstantMessage(fromAgentID, message,
                                                                       toAgentID, fromAgentName, dialog,
-                                                                      timestamp, UUID.Zero, fromGroup, binaryBucket);
+                                                                      timestamp, imSessionID, fromGroup, binaryBucket);
                             // Message sent
                             return;
                         }
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
 
                         user.ControllingClient.SendInstantMessage(fromAgentID, message,
                                                                   toAgentID, fromAgentName, dialog,
-                                                                  timestamp, UUID.Zero, fromGroup, binaryBucket);
+                                                                  timestamp, imSessionID, fromGroup, binaryBucket);
                         // Message sent
                         return;
                     }