* Guard against a failure to find an inventory item in a move request by complaining in the log rather than terminating the session

1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index b479fed..b0e4a87 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -968,12 +968,19 @@ namespace OpenSim.Region.Environment.Scenes
             }
 
             TaskInventoryItem taskItem = part.GetInventoryItem(itemId);
+            
+            if (null == taskItem)
+            {
+                m_log.WarnFormat("[PRIM INVENTORY]: Move of inventory item {0} from prim with local id {1} failed"
+                    + " because the inventory item could not be found",
+                    itemId, primLocalId);
+                
+                return;
+            }
 
             // Only owner can copy
             if (remoteClient.AgentId != taskItem.OwnerID)
-            {
                 return;
-            }
 
             MoveTaskInventoryItem(remoteClient, folderId, part, itemId);
         }