diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-10 10:14:17 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-10 10:14:17 -0800 |
| commit | f6a1858884958a67e68227d8078076681e7d478d (patch) | |
| tree | 9c1e1caf3ee0126eb140ba8dde42c664615e15ac /indra/newview/lltooldraganddrop.cpp | |
| parent | 9b4d09471cca6922257a27ba9cb70498ab81fd94 (diff) | |
| parent | 3e13bc913f3e527b1a9d4f500ad038c06cdf6525 (diff) | |
Merge with product-engine
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 2d0a14dc70..aa35f22930 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -772,6 +772,9 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop, { LLInventoryObject* cargo = locateInventory(item, cat); + // fix for EXT-3191 + if (NULL == cargo) return; + EAcceptance item_acceptance = ACCEPT_NO; handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE, mCargoTypes[mCurItemIndex], |