From 1c4233738123f1bcf3f9b45a527422cb09a43bcc Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 22 Sep 2012 14:41:19 -0700
Subject: HG Rez object: warn the user if the item or asset cannot be found.

---
 .../Framework/InventoryAccess/HGInventoryAccessModule.cs         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index a0cad40..80257bd 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -263,8 +263,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             //}
 
             // OK, we're done fetching. Pass it up to the default RezObject
-            return base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
-                                  RezSelected, RemoveItem, fromTaskID, attachment);
+            SceneObjectGroup sog = base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
+                                   RezSelected, RemoveItem, fromTaskID, attachment);
+
+            if (sog == null)
+                remoteClient.SendAgentAlertMessage("Unable to rez: problem accessing inventory or locating assets", false);
+
+            return sog;
 
         }
 
-- 
cgit v1.1