Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In the Region Tracker Floater, save all selected items when refreshing.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-03-21 03:47:21 -04:00
parent 578e5b7191
commit d7c8b00d90
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llui/llscrolllistctrl.h
View File

@@ -324,6 +324,23 @@ public:
BOOL hasSortOrder() const; BOOL hasSortOrder() const;
void clearSortOrder(); void clearSortOrder();
template<typename T> S32 selectMultiple(const std::vector<T>& vec)
{
size_t count = 0;
for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); ++iter)
{
LLScrollListItem* item = *iter;
for (std::vector<T>::const_iterator titr = vec.begin(); titr != vec.end(); ++titr)
if (item->getEnabled() && static_cast<T>(item->getValue()) == (*titr))
{
selectItem(item, false);
++count;
break;
}
}
if (mCommitOnSelectionChange) commitIfChanged();
return count;
}
S32 selectMultiple( uuid_vec_t ids ); S32 selectMultiple( uuid_vec_t ids );
// conceptually const, but mutates mItemList // conceptually const, but mutates mItemList
void updateSort() const; void updateSort() const;

10
indra/newview/alfloaterregiontracker.cpp
View File

@@ -118,7 +118,11 @@ void ALFloaterRegionTracker::refresh()
return; return;
} }
const std::string& saved_selected_value = mRegionScrollList->getSelectedValue().asString(); std::vector<const std::string> saved_selected_values;
BOOST_FOREACH(const LLScrollListItem* item, mRegionScrollList->getAllSelected())
{
saved_selected_values.push_back(item->getValue().asString());
}
mRegionScrollList->deleteAllItems(); mRegionScrollList->deleteAllItems();
const std::string& cur_region_name = gAgent.getRegion()->getName(); const std::string& cur_region_name = gAgent.getRegion()->getName();
@@ -174,8 +178,8 @@ void ALFloaterRegionTracker::refresh()
mRegionScrollList->addRow(row); mRegionScrollList->addRow(row);
} }
} }
if (!saved_selected_value.empty()) if (!saved_selected_values.empty())
mRegionScrollList->selectByValue(saved_selected_value); mRegionScrollList->selectMultiple(saved_selected_values);
} }
BOOL ALFloaterRegionTracker::tick() BOOL ALFloaterRegionTracker::tick()