diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-27 10:41:46 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-27 10:41:46 -0800 |
| commit | a77a49af4537ca7419947e083ae6950c1aba8330 (patch) | |
| tree | ea6613ae73a2179730e827ee49e24ff9c02aff65 /indra/newview/llinventoryfunctions.cpp | |
| parent | 4105ae946707947e469793364e07adde7993cffe (diff) | |
| parent | 5269c6e37c17eec5b662fd57d17e6a87fdccc421 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 1ae6fd91ce..1426567196 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1068,7 +1068,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root if ("delete" == action) { LLSD args; - args["QUESTION"] = LLTrans::getString(root->getNumSelectedItems() > 1 ? "DeleteItems" : "DeleteItem"); + args["QUESTION"] = LLTrans::getString(root->getSelectedCount() > 1 ? "DeleteItems" : "DeleteItem"); LLNotificationsUtil::add("DeleteItems", args, LLSD(), boost::bind(&LLInventoryAction::onItemsRemovalConfirmation, _1, _2, root)); return; } |