From c7e4880a5e45eccea527b8e1481e911dcd0602bf Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Jul 2010 03:36:26 -0700
Subject: One more buglet fixed related to mantis #4841 -- auto-returns were
 still chocking on a null pointer exception.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bcb5f7c..9ba13ae 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1597,7 +1597,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             // Handle god perms
-            if (Permissions.IsGod(remoteClient.AgentId))
+            if ((remoteClient != null) && Permissions.IsGod(remoteClient.AgentId))
             {
                 permissionToTake = true;
                 permissionToTakeCopy = true;
-- 
cgit v1.1