diff options
| author | James Cook <james@lindenlab.com> | 2010-01-11 14:06:09 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-01-11 14:06:09 -0800 |
| commit | a36087f5c1851b0bd5eec5788609f35b8a524384 (patch) | |
| tree | d7057930083ba9499fc8b3783a531b24ac9ea7f1 /indra/newview/llfolderview.cpp | |
| parent | a570c39bd3ca9ca567ef6a778305b8231535eb70 (diff) | |
| parent | 370a8592ac4c3b6eb6fd9f6ddd35960b763e634f (diff) | |
Merge, sync from viewer-2-0, fixed conflict in llinspectavatar.cpp
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 1ab111a41d..9aed403991 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -822,10 +822,11 @@ void LLFolderView::clearSelection() mSelectThisID.setNull(); } -BOOL LLFolderView::getSelectionList(std::set<LLUUID> &selection) +BOOL LLFolderView::getSelectionList(std::set<LLUUID> &selection) const { - selected_items_t::iterator item_it; - for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it) + for (selected_items_t::const_iterator item_it = mSelectedItems.begin(); + item_it != mSelectedItems.end(); + ++item_it) { selection.insert((*item_it)->getListener()->getUUID()); } |