diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-14 14:31:25 -0700 |
| commit | 562006aa5585a42418cae978516505035cd34d8d (patch) | |
| tree | f42488d1b07907937f5b9e236617d9f02297d32d /indra/newview/lltooldraganddrop.cpp | |
| parent | 9a8042d5a3edfd07727793a1939c3ab361ceec9a (diff) | |
| parent | 7cd1020f2953b776e1878e7b4e365d4b23e6b07b (diff) | |
Merge with SVN viewer-2.0.0-3 branch
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; } |