From 38e8853e5761d09a7e8f580dd277d9b99b834696 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sat, 1 Nov 2008 22:09:48 +0000
Subject: Megapatch that fixes/adds: friend offer/deny/accept, friendship
 termination, on-/offline updates, calling cards for friends. This adds
 methods in the DB layer and changes the MessagingServer, so a full update
 (incl. UGAIM) is necessary to get it working. Older regions shouldn't break,
 nor should older UGAIM break newer regions, but friends/presence will only
 work with all concerned parts (UGAIM, source region and destination region)
 at this revision (or later). I added the DB code for MSSQL, too, but couldn't
 test that. BEWARE: May contain bugs.

---
 .../Modules/Avatar/InstantMessage/InstantMessageModule.cs      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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

diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index adf1103..5597381 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -137,8 +137,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
             // 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.
 
-            // Don't send a Friend Dialog IM with a UUID.Zero session.
-            if (!dialogHandledElsewhere)
+            // Don't process IMs that are handled elsewhere (e.g. friend dialog
+            // IMs) with a non-UUID.Zero agent session, as those have been send
+            // by a client (either directly or from another region via
+            // inter-region communication) and will be processed in another
+            // module (e.g. the friends-module).
+            // IMs with fromAgentSession == UUID.Zero come from the server, and
+            // have to be passed to the matching viewer 
+            if (!dialogHandledElsewhere || fromAgentSession == UUID.Zero)
             {
                 // Try root avatar only first
                 foreach (Scene scene in m_scenes)
-- 
cgit v1.1