diff options
author | Oz Linden <oz@lindenlab.com> | 2015-08-11 11:54:57 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-08-11 11:54:57 -0400 |
commit | 1f23f5a65b3634be39815f853cc008a8b5ad833e (patch) | |
tree | af5f60fafb3b6af5225136a4effe3025e4ad09a6 /indra/llui/llfolderview.cpp | |
parent | 71a468c6fb52f2f2cc7ebd17e548e9eaf3a875a5 (diff) | |
parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) |
merge changes for 3.8.2-release
Diffstat (limited to 'indra/llui/llfolderview.cpp')
-rwxr-xr-x | indra/llui/llfolderview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp index 4c05d001a0..3282c5f726 100755 --- a/indra/llui/llfolderview.cpp +++ b/indra/llui/llfolderview.cpp @@ -730,7 +730,7 @@ void LLFolderView::removeSelectedItems() // structures. std::vector<LLFolderViewItem*> items; S32 count = mSelectedItems.size(); - if(count == 0) return; + if(count <= 0) return; LLFolderViewItem* item = NULL; selected_items_t::iterator item_it; for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it) @@ -947,7 +947,6 @@ void LLFolderView::cut() if (listener) { listener->cutToClipboard(); - listener->removeItem(); } } |