diff options
author | Rider Linden <rider@lindenlab.com> | 2015-08-11 12:18:47 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-08-11 12:18:47 -0700 |
commit | 9df2e7e4cb11a3ca7fabc2a3c443564da18b9a13 (patch) | |
tree | 29f0229aa5ad443ed36d56a2dca0102fd83c1447 /indra/llui/llfolderview.cpp | |
parent | 5a0025026cee93eb657290544b95eb00557ae5f1 (diff) | |
parent | 310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff) |
Merge
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(); } } |