From 5c920015e999cfe9860e769105632891db3e1916 Mon Sep 17 00:00:00 2001 From: Nicholaz Beresford Date: Wed, 17 Sep 2008 01:49:35 -0500 Subject: VWR-2003: Possible crash in lltooldraganddrop.cpp. --- linden/indra/newview/lltooldraganddrop.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linden') diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp index c492c7b..7a378a9 100644 --- a/linden/indra/newview/lltooldraganddrop.cpp +++ b/linden/indra/newview/lltooldraganddrop.cpp @@ -929,6 +929,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], -- cgit v1.1