diff options
| author | Jacek Antonelli | 2008-09-17 16:26:34 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-17 16:26:34 -0500 |
| commit | b6876313bf6266c17d8774882d48f8d56e7c033c (patch) | |
| tree | 23096c1b8debfd7581f33e0ea0ec604399206bdc /linden/indra/newview | |
| parent | Merge branch 'VWR-2683' into nicholaz-patches (diff) | |
| parent | VWR-2003: Possible crash in lltooldraganddrop.cpp. (diff) | |
| download | meta-impy-b6876313bf6266c17d8774882d48f8d56e7c033c.zip meta-impy-b6876313bf6266c17d8774882d48f8d56e7c033c.tar.gz meta-impy-b6876313bf6266c17d8774882d48f8d56e7c033c.tar.bz2 meta-impy-b6876313bf6266c17d8774882d48f8d56e7c033c.tar.xz | |
Merge branch 'VWR-2003' into nicholaz-patches
Diffstat (limited to 'linden/indra/newview')
| -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 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, | |||
| 929 | { | 929 | { |
| 930 | LLInventoryObject* cargo = locateInventory(item, cat); | 930 | LLInventoryObject* cargo = locateInventory(item, cat); |
| 931 | 931 | ||
| 932 | if (!cargo) | ||
| 933 | { | ||
| 934 | handled = FALSE; | ||
| 935 | break; | ||
| 936 | } | ||
| 937 | |||
| 932 | EAcceptance item_acceptance = ACCEPT_NO; | 938 | EAcceptance item_acceptance = ACCEPT_NO; |
| 933 | handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE, | 939 | handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE, |
| 934 | mCargoTypes[mCurItemIndex], | 940 | mCargoTypes[mCurItemIndex], |