From e1ccbed982cd4500a8b04a5399ac0053d3c2cb47 Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Sun, 16 Nov 2008 19:45:46 +0000
Subject: GridIMs don't have a (sending) client, which led to a NRE on access.
 Doesn't use client now in that case.

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

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

diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index 1b7eb97..339f1f9 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -127,7 +127,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
                 return;
             }
 
-            GridInstantMessage im = new GridInstantMessage(client.Scene,
+            IScene scene = client == null ? null : client.Scene;
+            GridInstantMessage im = new GridInstantMessage(scene,
                     fromAgentID, fromAgentName, fromAgentSession, toAgentID,
                     dialog, fromGroup, message, imSessionID,
                     offline != 0 ? true : false, Position,
-- 
cgit v1.1