From 98cc2365034a93c69704daa69efb389799cc9627 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 24 Aug 2010 18:44:39 +0100 Subject: Backed out changeset a62bf7c0af21 Backing out this merge that I pushed (prematurely) to the wrong place. --- indra/newview/llinventoryitemslist.cpp | 37 ---------------------------------- 1 file changed, 37 deletions(-) (limited to 'indra/newview/llinventoryitemslist.cpp') diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp index 348d7ebcec..2b81ba8a12 100644 --- a/indra/newview/llinventoryitemslist.cpp +++ b/indra/newview/llinventoryitemslist.cpp @@ -80,37 +80,6 @@ boost::signals2::connection LLInventoryItemsList::setRefreshCompleteCallback(con return mRefreshCompleteSignal.connect(cb); } -bool LLInventoryItemsList::selectItemByValue(const LLSD& value, bool select) -{ - if (!LLFlatListView::selectItemByValue(value, select) && !value.isUndefined()) - { - mSelectTheseIDs.push_back(value); - return false; - } - return true; -} - -void LLInventoryItemsList::updateSelection() -{ - if(mSelectTheseIDs.empty()) return; - - std::vector cur; - getValues(cur); - - for(std::vector::const_iterator cur_id_it = cur.begin(); cur_id_it != cur.end() && !mSelectTheseIDs.empty(); ++cur_id_it) - { - uuid_vec_t::iterator select_ids_it = std::find(mSelectTheseIDs.begin(), mSelectTheseIDs.end(), *cur_id_it); - if(select_ids_it != mSelectTheseIDs.end()) - { - selectItemByUUID(*select_ids_it); - mSelectTheseIDs.erase(select_ids_it); - } - } - - scrollToShowFirstSelectedItem(); - mSelectTheseIDs.clear(); -} - void LLInventoryItemsList::doIdle() { if (!mNeedsRefresh) return; @@ -179,12 +148,6 @@ void LLInventoryItemsList::refresh() bool needs_refresh = add_limit_exceeded; setNeedsRefresh(needs_refresh); setForceRefresh(needs_refresh); - - // After list building completed, select items that had been requested to select before list was build - if(!needs_refresh) - { - updateSelection(); - } } void LLInventoryItemsList::computeDifference( -- cgit v1.3