1 files changed, 6 insertions, 0 deletions

diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 39070b7..72ee24b 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -850,6 +850,12 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
                 {
                         LLInventoryObject* cargo = locateInventory(item, cat);
 
+                        if (!cargo) 
+                        {
+                                handled = FALSE;
+                                break;
+                        }
+
                         EAcceptance item_acceptance = ACCEPT_NO;
                         handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE,
                                                                                                 mCargoTypes[mCurItemIndex],