This fixes the crash reported in http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.

1 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
index dee86df..7753c25 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
@@ -196,10 +196,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
             Util.FireAndForget(delegate
             {
-                bool success = m_IMService.OutgoingInstantMessage(im, url, foreigner);
-                if (!success && account == null)
+                bool success = false;
+                if (foreigner && url == string.Empty) // we don't know about this user
                 {
-                    // One last chance
                     string recipientUUI = TryGetRecipientUUI(new UUID(im.fromAgentID), toAgentID);
                     m_log.DebugFormat("[HG MESSAGE TRANSFER]: Got UUI {0}", recipientUUI);
                     if (recipientUUI != string.Empty)
@@ -213,6 +212,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         }
                     }
                 }
+                else
+                    success = m_IMService.OutgoingInstantMessage(im, url, foreigner);
+
                 if (!success && !foreigner)
                     HandleUndeliveredMessage(im, result);
                 else