diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-05 10:49:17 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-05 10:49:17 +0100 |
| commit | e23643c46b8f80180b1ac901b930c18e5df9171d (patch) | |
| tree | da49c1923cf409e9b16a3021f3c8762fe91c0e53 /indra/newview/lltooldraganddrop.cpp | |
| parent | 2d70b8f05286251f25f33a33c507c0a9c0d4e370 (diff) | |
| parent | 033f0dbdef5d23858065dcdcc2f70e5546f50651 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index bc77ac5fd1..c862c02b82 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1878,24 +1878,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearItem( LLNotificationsUtil::add("CanNotChangeAppearanceUntilLoaded"); return ACCEPT_NO; } - - if (mSource == SOURCE_LIBRARY) - { - // create item based on that one, and put it on if that - // was a success. - LLPointer<LLInventoryCallback> cb = new WearOnAvatarCallback(); - copy_inventory_item( - gAgent.getID(), - item->getPermissions().getOwner(), - item->getUUID(), - LLUUID::null, - std::string(), - cb); - } - else - { - wear_inventory_item_on_avatar( item ); - } + LLAppearanceMgr::instance().wearItemOnAvatar(item->getUUID(),true, !(mask & MASK_CONTROL)); } return ACCEPT_YES_MULTI; } |