diff options
| author | Jacek Antonelli | 2008-10-31 18:57:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-31 18:57:44 -0500 |
| commit | 8a81ec3cc7f5998f7d75ef24f57bd9fc6eec1312 (patch) | |
| tree | 606a35c18cf584a4a9e3182f69e929772a4d7bdf /linden/indra/newview/lltooldraganddrop.cpp | |
| parent | Disable fmod by default. (diff) | |
| parent | Merge branch 'VWR-2003' into nicholaz-patches (diff) | |
| download | meta-impy-8a81ec3cc7f5998f7d75ef24f57bd9fc6eec1312.zip meta-impy-8a81ec3cc7f5998f7d75ef24f57bd9fc6eec1312.tar.gz meta-impy-8a81ec3cc7f5998f7d75ef24f57bd9fc6eec1312.tar.bz2 meta-impy-8a81ec3cc7f5998f7d75ef24f57bd9fc6eec1312.tar.xz | |
Merge branch 'nicholaz-patches' into next
Diffstat (limited to 'linden/indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | linden/indra/newview/lltooldraganddrop.cpp | 6 |
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, | |||
| 850 | { | 850 | { |
| 851 | LLInventoryObject* cargo = locateInventory(item, cat); | 851 | LLInventoryObject* cargo = locateInventory(item, cat); |
| 852 | 852 | ||
| 853 | if (!cargo) | ||
| 854 | { | ||
| 855 | handled = FALSE; | ||
| 856 | break; | ||
| 857 | } | ||
| 858 | |||
| 853 | EAcceptance item_acceptance = ACCEPT_NO; | 859 | EAcceptance item_acceptance = ACCEPT_NO; |
| 854 | handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE, | 860 | handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE, |
| 855 | mCargoTypes[mCurItemIndex], | 861 | mCargoTypes[mCurItemIndex], |