From debc780654dba27acdef0de384d0db4b586b02be Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 5 Jul 2010 07:14:32 -0700
Subject: Fixes additional bug reported in mantis #4841.

---
 .../CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index cd66af5..8ccc941 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             return ret;
         }
 
-        // DO NOT OVERRIDE THIS METHOD
+        // DO NOT OVERRIDE THE BASE METHOD
         public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
                 SceneObjectGroup objectGroup, IClientAPI remoteClient)
         {
@@ -139,7 +139,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
             if (!assetID.Equals(UUID.Zero))
             {
-                UploadInventoryItem(remoteClient.AgentId, assetID, "", 0);
+                if (remoteClient != null)
+                    UploadInventoryItem(remoteClient.AgentId, assetID, "", 0);
             }
             else
                 m_log.Debug("[HGScene]: Scene.Inventory did not create asset");
-- 
cgit v1.1