diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-21 18:33:29 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-21 18:33:29 -0700 |
| commit | 2e91033504a0e7ef43d28842c0e4a82dd01fa9d0 (patch) | |
| tree | 27e81e43927f8a95144eb64f7eb6cafb2d0a5837 /indra/llui | |
| parent | 6550f739cad56c8ff04eb0d334b34b20201124b5 (diff) | |
| parent | fb78a0cac235e8ee5ccbcb724f38ffa00ddfa930 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/llui')
| -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 b9256dd890..1c74395c66 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -1059,10 +1059,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); |