diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-03-29 18:06:05 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-03-29 18:06:05 -0400 |
| commit | adc4f8d02e1184b3072a4ff511594d31c3cd68e0 (patch) | |
| tree | 24ca324105772f18b70135f7d68bcc88cc993b83 /indra/llui/lltoolbar.cpp | |
| parent | 8e7c04f1d0ef6a7be800a7f3539f301aaededd14 (diff) | |
| parent | ab272c20a914c4816cee55db7a4bdd0217580630 (diff) | |
merge
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); |