diff options
| author | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-11 08:49:37 -0800 |
| commit | 6542ffe2f05c47d74dfbe659041d956d609f91f3 (patch) | |
| tree | 7794c0737c5a78b0339c2c34b47c9d32c44de749 /indra/newview/lltooldraganddrop.cpp | |
| parent | 431bfca2ade364dc1165e402537e5e2d3616ebfd (diff) | |
| parent | eda8634b17133df5f3104d96ad56d3626a90aad8 (diff) | |
Merge viewer 2-0 into media
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], |