diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-21 20:46:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-21 20:46:00 -0400 |
| commit | 82e297cf343151be116b59187b36b8a10b965250 (patch) | |
| tree | 01dc0257f8a0c1633abc85b8c9ab89337eae18e7 /indra/llui | |
| parent | 43d7c80e8e2cd1cfe4e6c4214b4a4df9341d310b (diff) | |
| parent | 06369c5707cd5418b6dedf43a2113482da666cf4 (diff) | |
merge changes for DRTVWR-304
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); |