From 6f78358b09e5a14c4af802a12cfb805b8fc8cdb4 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 26 Sep 2010 23:50:55 +0100
Subject: When receiving intersim IM, don't let the spoof protection bomb

---
 .../Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index bafb802..af39565 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -158,7 +158,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
             if (m_TransferModule != null)
             {
-                im.fromAgentName = client.FirstName + " " + client.LastName;
+                if (client != null)
+                    im.fromAgentName = client.FirstName + " " + client.LastName;
                 m_TransferModule.SendInstantMessage(im,
                     delegate(bool success)
                     {
-- 
cgit v1.1