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.

---
 OpenSim/Framework/GridInstantMessage.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 4ca4e67..9cecf42 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -75,9 +75,12 @@ namespace OpenSim.Framework
                 offline = 0;
             Position = _position;
             binaryBucket = _binaryBucket;
-            
-            ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID;
-            RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid;
+
+            if (scene != null)
+            {
+                ParentEstateID = scene.RegionInfo.EstateSettings.ParentEstateID;
+                RegionID = scene.RegionInfo.RegionSettings.RegionUUID.Guid;
+            }
             timestamp = (uint)Util.UnixTimeSinceEpoch();
         }
 
-- 
cgit v1.1