diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-13 08:58:36 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-13 08:58:36 -0700 |
| commit | 1a9eaf09b0f36b675732d04c6f10615e2a8a9e05 (patch) | |
| tree | f8c32307849000c31f6ff1101e82cba221b5b458 /indra/llui/lltoolbar.cpp | |
| parent | 303579309d805ce8f48dc0af3b19eaa38533dfe8 (diff) | |
EXP-1331 : Fix the drag to position 0 case I broke while fixing the drag on itself case... Aaagh...
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 3ea0968bfc..7fcd1da7b1 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -848,7 +848,7 @@ BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, int orig_rank = getRankFromPosition(dragged_command); mDragRank = getRankFromPosition(x, y); // Don't DaD if we're dragging a command on itself - mDragAndDropTarget = ((mDragRank == orig_rank) || ((mDragRank-1) == orig_rank) ? false : true); + mDragAndDropTarget = ((orig_rank != RANK_NONE) && ((mDragRank == orig_rank) || ((mDragRank-1) == orig_rank)) ? false : true); llinfos << "Merov debug : DaD, rank = " << mDragRank << ", hit uuid = " << mDragCommand.uuid() << ", dragged uui = " << inv_item->getUUID() << llendl; /* Do the following if you want to animate the button itself LLCommandId dragged_command(inv_item->getUUID()); |