diff options
| author | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-03-28 19:16:48 -0700 |
| commit | 14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78 (patch) | |
| tree | 60f4de9fcd1b22b8dd504218a870e8abea599a81 /indra/llui/lltoolbar.cpp | |
| parent | d4b3c23da11dd963915d078b169ac9ac0cf7b7bf (diff) | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
Merged lindenlab/viewer-development into default
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 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); |