diff options
author | Richard Linden <none@none> | 2013-03-06 11:08:49 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-03-06 11:08:49 -0800 |
commit | 4a5f14afc987b645c68705b0313aebbc3ba1d811 (patch) | |
tree | be3c96145b3be558b0131978a7c53c3aece15852 /indra/newview/llselectmgr.cpp | |
parent | a6bb68b6e530df91d03abfc062c700ebc4e856aa (diff) | |
parent | f07b9c2c69f1f6882dcf249aacf33cdfacf878ab (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 36ce7bb60e..bdbb1bb797 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1550,7 +1550,7 @@ void LLObjectSelection::applyNoCopyTextureToTEs(LLViewerInventoryItem* item) } // apply texture for the selected faces - LLStatViewer::EDIT_TEXTURE.add(1); + add(LLStatViewer::EDIT_TEXTURE, 1); object->setTEImage(te, image); dialog_refresh_all(); @@ -3424,7 +3424,7 @@ bool LLSelectMgr::confirmDelete(const LLSD& notification, const LLSD& response, gAgentCamera.setLookAt(LOOKAT_TARGET_CLEAR); // Keep track of how many objects have been deleted. - LLStatViewer::DELETE_OBJECT.add(LLSelectMgr::getInstance()->mSelectedObjects->getObjectCount()); + add(LLStatViewer::DELETE_OBJECT, LLSelectMgr::getInstance()->mSelectedObjects->getObjectCount()); } break; case 1: |