1 files changed, 19 insertions, 15 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index 4fde9bb..da9b5ec 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -113,24 +113,28 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
                                                    UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                                                    bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
-            CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
-            if (userInfo != null)
+            //m_log.DebugFormat("[HGScene] RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID);
+
+            if (fromTaskID.Equals(UUID.Zero))
             {
-                if (userInfo.RootFolder != null)
+                CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
+                if (userInfo != null)
                 {
-                    InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
-
-                    if (item == null)
-                    { // Fetch the item
-                        item = new InventoryItemBase();
-                        item.Owner = remoteClient.AgentId;
-                        item.ID = itemID;
-                        item = m_assMapper.Get(item, userInfo.RootFolder.ID, userInfo);
-                    }
-                    if (item != null)
+                    if (userInfo.RootFolder != null)
                     {
-                        m_assMapper.Get(item.AssetID, remoteClient.AgentId);
-                        
+                        InventoryItemBase item = userInfo.RootFolder.FindItem(itemID);
+                        if (item == null)
+                        { // Fetch the item
+                            item = new InventoryItemBase();
+                            item.Owner = remoteClient.AgentId;
+                            item.ID = itemID;
+                            item = m_assMapper.Get(item, userInfo.RootFolder.ID, userInfo);
+                        }
+                        if (item != null)
+                        {
+                            m_assMapper.Get(item.AssetID, remoteClient.AgentId);
+
+                        }
                     }
                 }
             }