livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing avatar list to allow multiple people to be selected along with showing the TP button while the AV list was shown. Fixes FIRE-2470.

Liny 2011-12-30 18:55:11 -08:00
parent a1f4749076
commit add385db10
3 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/fsradarlistctrl.cpp
View File

@ -68,16 +68,30 @@ BOOL LLRadarListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
if ( (mContextMenu) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
// [/RLVa:KB-FS]
{
LLScrollListItem* hit_item = hitItem(x, y);
if (hit_item)
if(getAllSelected().size() > 1)
{
llinfos << "Right-click select by value: " << hit_item->getValue() << llendl;
selectByID(hit_item->getValue());
LLUUID av = hit_item->getValue();
//llinfos << "Right-click select by value: (multi-select)" << llendl;
uuid_vec_t selected_uuids;
selected_uuids.push_back(av);
for(size_t i=0;i<getAllSelected().size();i++)
{
llinfos << "Right-click select by value: " << getAllSelected().at(i)->getColumn(getColumn("uuid")->mIndex)->getValue().asUUID() << llendl;
selected_uuids.push_back(getAllSelected().at(i)->getColumn(getColumn("uuid")->mIndex)->getValue().asUUID());
}
mContextMenu->show(this, selected_uuids, x, y);
}
else
{
LLScrollListItem* hit_item = hitItem(x, y);
if (hit_item)
{
llinfos << "Right-click select by value: " << hit_item->getValue() << llendl;
selectByID(hit_item->getValue());
LLUUID av = hit_item->getValue();
uuid_vec_t selected_uuids;
selected_uuids.push_back(av);
mContextMenu->show(this, selected_uuids, x, y);
}
}
}
return handled;
}

30
indra/newview/llpanelpeople.cpp
View File

@ -902,13 +902,12 @@ void LLPanelPeople::updateNearbyList()
time_t now = time(NULL);
//STEP 0: Clear model data, saving pieces as needed.
LLScrollListItem* lastRadarSelectedItem = mRadarList->getFirstSelected();
LLUUID selected_id;
S32 lastScroll = mRadarList->getScrollPos();
if (lastRadarSelectedItem)
std::vector<LLUUID> selected_ids;
for(size_t i=0;i<mRadarList->getAllSelected().size();i++)
{
selected_id = lastRadarSelectedItem->getColumn(mRadarList->getColumn("uuid")->mIndex)->getValue().asUUID();
selected_ids.push_back(mRadarList->getAllSelected().at(i)->getColumn(mRadarList->getColumn("uuid")->mIndex)->getValue().asUUID());
}
S32 lastScroll = mRadarList->getScrollPos();
mRadarList->clearRows();
mRadarEnterAlerts.clear();
mRadarLeaveAlerts.clear();
@ -1235,17 +1234,25 @@ void LLPanelPeople::updateNearbyList()
}
//AO: Preserve selection
if (lastRadarSelectedItem)
/*if (lastRadarSelectedItem)
{
if (avId == selected_id)
{
mRadarList->selectByID(avId);
updateButtons(); // TODO: only update on change, instead of every tick
}
}
}*/
} // End STEP 2, all model/presentation row processing complete.
//Reset scroll position
mRadarList->setScrollPos(lastScroll);
//Reset selection list
//AO: Preserve selection
if(!selected_ids.empty())
{
mRadarList->selectMultiple(selected_ids);
}
updateButtons();
//
//STEP 3 , process any bulk actions that require the whole model to be known first
@ -1480,7 +1487,7 @@ void LLPanelPeople::updateButtons()
buttonSetVisible("im_btn", !group_tab_active);
buttonSetVisible("call_btn", !group_tab_active);
buttonSetVisible("group_call_btn", group_tab_active);
buttonSetVisible("teleport_btn", friends_tab_active);
buttonSetVisible("teleport_btn", nearby_tab_active || friends_tab_active);
buttonSetVisible("share_btn", nearby_tab_active || friends_tab_active);
if (group_tab_active)
@ -1612,9 +1619,10 @@ void LLPanelPeople::getCurrentItemIDs(uuid_vec_t& selected_uuids) const
{
// AO, adapted for scrolllist. No multiselect yet
//mNearbyList->getSelectedUUIDs(selected_uuids);
LLScrollListItem* item = mRadarList->getFirstSelected();
if (item)
selected_uuids.push_back(item->getColumn(mRadarList->getColumn("name")->mIndex)->getValue().asUUID());
for(size_t i=0;i<mRadarList->getAllSelected().size();i++)
{
selected_uuids.push_back(mRadarList->getAllSelected().at(i)->getColumn(mRadarList->getColumn("uuid")->mIndex)->getValue().asUUID());
}
}
else if (cur_tab == RECENT_TAB_NAME)
mRecentList->getSelectedUUIDs(selected_uuids);

2
indra/newview/skins/default/xui/en/panel_people.xml
View File

@ -155,7 +155,7 @@ Looking for people to hang out with? Use the search box to find topics or conten
sort_ascending="true"
name="radar_list"
draw_stripes="true"
multi_select="false"
multi_select="true"
width="311">
<radar_list.columns
label="NAME"