diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-25 21:57:01 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-25 21:57:01 +0200 |
| commit | f86be5c85f30af83e761b0c94e089ec82532db48 (patch) | |
| tree | ebf4bba5b4dda31d4779a051d7f5cccf5e7ac6d1 /indra/llui | |
| parent | 385de35b93f2df736ffd77f11a354d44e0a83d34 (diff) | |
| parent | 0af5b073e0557a4918d4094841c3a045a8c71ba9 (diff) | |
merge
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); |