diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-29 12:30:09 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-29 12:30:09 -0400 |
| commit | b6e7850c0a3d65ed0a1501e19a1655055000e32f (patch) | |
| tree | 553d336a12691fb1c1caebc0e1979fc3567b02b7 /indra/newview/lltooldraganddrop.cpp | |
| parent | 58d76a9ecf83b49e42fabfada27ca20814f93cf3 (diff) | |
| parent | b2a667b7222640a384cb23763b32f8746b0c8cd8 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index c3aba4e591..9d7f42a978 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -2366,7 +2366,7 @@ EAcceptance LLToolDragAndDrop::dad3dActivateGesture( } else { - LLGestureManager::instance().activateGesture(item->getUUID()); + LLGestureMgr::instance().activateGesture(item->getUUID()); gInventory.updateItem(item); gInventory.notifyObservers(); } @@ -2410,7 +2410,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( if (drop) { BOOL append = ( (mask & MASK_SHIFT) ? TRUE : FALSE ); - LLAppearanceManager::instance().wearInventoryCategory(category, false, append); + LLAppearanceMgr::instance().wearInventoryCategory(category, false, append); } return ACCEPT_YES_MULTI; } @@ -2418,7 +2418,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( { if (drop) { - LLAppearanceManager::instance().wearInventoryCategory(category, true, false); + LLAppearanceMgr::instance().wearInventoryCategory(category, true, false); } return ACCEPT_YES_MULTI; } |