diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-02 16:02:13 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-02 16:02:13 -0400 |
| commit | 323a2f2235a52383bcfbae79bdce9e61ca808d2a (patch) | |
| tree | 313d298add46edae3dadc1f3426b8fa68f9452fe /indra/llui/lltoolbar.cpp | |
| parent | 557adcabb925acbcc79f39f76f7cb74b6202a8da (diff) | |
| parent | 49731dd21dec5fb8b6e5781940bab5f5fa9600a2 (diff) | |
pulling in sunshine-stable to sunshine-internal.
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); |