diff options
| author | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-29 10:37:58 -0500 |
|---|---|---|
| committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-29 10:37:58 -0500 |
| commit | 0f24668b0a834e37a3a8767abc7b0ee51bf23fcd (patch) | |
| tree | 4ae685f79c3964e1ac7246641fa9d957b25b5ee1 /indra/llui/lltoolbar.cpp | |
| parent | 8e6d2f8ddc3fe8a1eee3abe99eb5abd3575c5841 (diff) | |
| parent | a62a824efb89aff3056d0659ee2c23ad6d15eeaa (diff) | |
Merged in Chui beta6+ fixes
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index f9703256c4..3d9f5cbbc2 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -1055,10 +1055,9 @@ BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, // Convert drag position into insert position and rank if (!isReadOnly() && handled && !drop) { - LLInventoryItem* inv_item = (LLInventoryItem*)cargo_data; - LLAssetType::EType type = inv_item->getType(); - if (type == LLAssetType::AT_WIDGET) + if (cargo_type == DAD_WIDGET) { + LLInventoryItem* inv_item = (LLInventoryItem*)cargo_data; LLCommandId dragged_command(inv_item->getUUID()); int orig_rank = getRankFromPosition(dragged_command); mDragRank = getRankFromPosition(x, y); |