From 14368d9a732d4e8f6508aec07a3c3c51e3e9f33e Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 30 Dec 2007 04:12:08 +0000
Subject: * Applied Melanie's same instance IM fix.  This will make IMs work
 within the same OpenSim Instance.

---
 OpenSim/Region/Environment/Modules/InstantMessageModule.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
index cf6a94d..1e1d236 100644
--- a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
@@ -63,7 +63,9 @@ namespace OpenSim.Region.Environment.Modules
         private void OnInstantMessage(LLUUID fromAgentID,
                                       LLUUID fromAgentSession, LLUUID toAgentID,
                                       LLUUID imSessionID, uint timestamp, string fromAgentName,
-                                      string message, byte dialog)
+                                      string message, byte dialog, bool fromGroup, byte offline, 
+                                      uint ParentEstateID, LLVector3 Position, LLUUID RegionID, 
+                                      byte[] binaryBucket)
         {
             foreach (Scene scene in m_scenes)
             {
@@ -76,9 +78,9 @@ namespace OpenSim.Region.Environment.Modules
                         user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message,
                                                                   toAgentID, imSessionID, fromAgentName, dialog,
                                                                   timestamp);
+						// Message sent
+						return;
                     }
-                    // Message sent
-                    return;
                 }
             }
 
@@ -104,4 +106,4 @@ namespace OpenSim.Region.Environment.Modules
             get { return true; }
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1