diff options
| author | Bradley Payne <vir@lindenlab.com> | 2009-09-10 18:42:19 +0000 |
|---|---|---|
| committer | Bradley Payne <vir@lindenlab.com> | 2009-09-10 18:42:19 +0000 |
| commit | 73d152093dd5bb31ad264afdd3dc8e283dff49e3 (patch) | |
| tree | f69a7b99e675affb4bd4b3cab248b425caaf5566 /indra/newview/lltooldraganddrop.cpp | |
| parent | 3dfa1e4ab9da0d2a5d48ea771877fc16fdd73ad5 (diff) | |
For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3.
svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index b35208cd03..08040cfaa5 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -73,6 +73,7 @@ #include "llimview.h" #include "llrootview.h" #include "llagentui.h" +#include "llappearancemgr.h" // MAX ITEMS is based on (sizeof(uuid)+2) * count must be < MTUBYTES // or 18 * count < 1200 => count < 1200/18 => 66. I've cut it down a @@ -2508,7 +2509,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( if(drop) { BOOL append = ( (mask & MASK_SHIFT) ? TRUE : FALSE ); - wear_inventory_category(category, false, append); + LLAppearanceManager::wearInventoryCategory(category, false, append); } return ACCEPT_YES_MULTI; } @@ -2516,7 +2517,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( { if(drop) { - wear_inventory_category(category, true, false); + LLAppearanceManager::wearInventoryCategory(category, true, false); } return ACCEPT_YES_MULTI; } |