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

MAINT-8997 Add "Sort by recent arrival" to viewer People / Nearby map and list

meow-7.2.2
maxim_productengine 2018-08-23 15:38:04 +03:00
parent cdef4175d4
commit c24f638088
5 changed files with 99 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
indra/newview/llpanelpeople.cpp
View File

@ -213,10 +213,39 @@ protected:
}
};
class LLAvatarItemRecentArrivalComparator : public LLAvatarItemNameComparator
{
public:
LLAvatarItemRecentArrivalComparator() {};
virtual ~LLAvatarItemRecentArrivalComparator() {};
protected:
virtual bool doCompare(const LLAvatarListItem* item1, const LLAvatarListItem* item2) const
{
F32 arr_time1 = LLRecentPeople::instance().getArrivalTimeByID(item1->getAvatarId());
F32 arr_time2 = LLRecentPeople::instance().getArrivalTimeByID(item2->getAvatarId());
if (arr_time1 == arr_time2)
{
std::string name1 = item1->getAvatarName();
std::string name2 = item2->getAvatarName();
LLStringUtil::toUpper(name1);
LLStringUtil::toUpper(name2);
return name1 < name2;
}
return arr_time1 > arr_time2;
}
};
static const LLAvatarItemRecentComparator RECENT_COMPARATOR;
static const LLAvatarItemStatusComparator STATUS_COMPARATOR;
static LLAvatarItemDistanceComparator DISTANCE_COMPARATOR;
static const LLAvatarItemRecentSpeakerComparator RECENT_SPEAKER_COMPARATOR;
static LLAvatarItemRecentArrivalComparator RECENT_ARRIVAL_COMPARATOR;
static LLPanelInjector<LLPanelPeople> t_people("panel_people");
@ -539,6 +568,8 @@ LLPanelPeople::LLPanelPeople()
mEnableCallbackRegistrar.add("People.Nearby.ViewSort.CheckItem", boost::bind(&LLPanelPeople::onNearbyViewSortMenuItemCheck, this, _2));
mEnableCallbackRegistrar.add("People.Group.Plus.Validate", boost::bind(&LLPanelPeople::onGroupPlusButtonValidate, this));
doPeriodically(boost::bind(&LLPanelPeople::updateNearbyArrivalTime, this), 2.0);
}
LLPanelPeople::~LLPanelPeople()
@ -1049,6 +1080,10 @@ void LLPanelPeople::setSortOrder(LLAvatarList* list, ESortOrder order, bool save
list->setComparator(&DISTANCE_COMPARATOR);
list->sort();
break;
case E_SORT_BY_RECENT_ARRIVAL:
list->setComparator(&RECENT_ARRIVAL_COMPARATOR);
list->sort();
break;
default:
LL_WARNS() << "Unrecognized people sort order for " << list->getName() << LL_ENDL;
return;
@ -1386,6 +1421,10 @@ void LLPanelPeople::onNearbyViewSortMenuItemClicked(const LLSD& userdata)
{
setSortOrder(mNearbyList, E_SORT_BY_DISTANCE);
}
else if (chosen_item == "sort_arrival")
{
setSortOrder(mNearbyList, E_SORT_BY_RECENT_ARRIVAL);
}
else if (chosen_item == "view_usernames")
{
bool hide_usernames = !gSavedSettings.getBOOL("NearbyListHideUsernames");
@ -1407,6 +1446,8 @@ bool LLPanelPeople::onNearbyViewSortMenuItemCheck(const LLSD& userdata)
return sort_order == E_SORT_BY_NAME;
if (item == "sort_distance")
return sort_order == E_SORT_BY_DISTANCE;
if (item == "sort_arrival")
return sort_order == E_SORT_BY_RECENT_ARRIVAL;
return false;
}
@ -1594,5 +1635,15 @@ bool LLPanelPeople::isAccordionCollapsedByUser(const std::string& name)
return isAccordionCollapsedByUser(getChild<LLUICtrl>(name));
}
bool LLPanelPeople::updateNearbyArrivalTime()
{
std::vector<LLVector3d> positions;
std::vector<LLUUID> uuids;
static LLCachedControl<F32> range(gSavedSettings, "NearMeRange");
LLWorld::getInstance()->getAvatars(&uuids, &positions, gAgent.getPositionGlobal(), range);
LLRecentPeople::instance().updateAvatarsArrivalTime(uuids);
return LLApp::isExiting();
}
// EOF

3
indra/newview/llpanelpeople.h
View File

@ -62,6 +62,8 @@ public:
// internals
class Updater;
bool updateNearbyArrivalTime();
private:
typedef enum e_sort_oder {
@ -70,6 +72,7 @@ private:
E_SORT_BY_MOST_RECENT = 2,
E_SORT_BY_DISTANCE = 3,
E_SORT_BY_RECENT_SPEAKERS = 4,
E_SORT_BY_RECENT_ARRIVAL = 5
} ESortOrder;
void removePicker();

30
indra/newview/llrecentpeople.cpp
View File

@ -126,3 +126,33 @@ bool LLRecentPeople::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
add(event->getValue().asUUID());
return true;
}
void LLRecentPeople::updateAvatarsArrivalTime(uuid_vec_t& uuids)
{
id_to_time_map_t buf = mAvatarsArrivalTime;
mAvatarsArrivalTime.clear();
for (uuid_vec_t::const_iterator id_it = uuids.begin(); id_it != uuids.end(); ++id_it)
{
if (buf.find(*id_it) != buf.end())
{
mAvatarsArrivalTime[*id_it] = buf[*id_it];
}
else
{
mAvatarsArrivalTime[*id_it] = LLDate::now().secondsSinceEpoch();
}
}
}
F32 LLRecentPeople::getArrivalTimeByID(const LLUUID& id)
{
id_to_time_map_t::const_iterator it = mAvatarsArrivalTime.find(id);
if (it != mAvatarsArrivalTime.end())
{
return it->second;
}
return LLDate::now().secondsSinceEpoch();
}

5
indra/newview/llrecentpeople.h
View File

@ -53,6 +53,7 @@ class LLRecentPeople: public LLSingleton<LLRecentPeople>, public LLOldEvents::LL
LLSINGLETON_EMPTY_CTOR(LLRecentPeople);
LOG_CLASS(LLRecentPeople);
public:
typedef std::map <LLUUID, F32> id_to_time_map_t;
typedef boost::signals2::signal<void ()> signal_t;
/**
@ -116,6 +117,9 @@ public:
*/
/*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata);
void updateAvatarsArrivalTime(uuid_vec_t& uuids);
F32 getArrivalTimeByID(const LLUUID& id);
private:
const LLUUID& getIDByPhoneNumber(const LLSD& userdata);
@ -123,6 +127,7 @@ private:
typedef std::map<LLUUID, LLSD> recent_people_t;
recent_people_t mPeople;
signal_t mChangedSignal;
id_to_time_map_t mAvatarsArrivalTime;
};
#endif // LL_LLRECENTPEOPLE_H

10
indra/newview/skins/default/xui/en/menu_people_nearby_view.xml
View File

@ -33,6 +33,16 @@
function="People.Nearby.ViewSort.CheckItem"
parameter="sort_distance"/>
</menu_item_check>
<menu_item_check
label="Sort by Recent arrival"
name="sort_arrival">
<menu_item_check.on_click
function="People.Nearby.ViewSort.Action"
parameter="sort_arrival"/>
<menu_item_check.on_check
function="People.Nearby.ViewSort.CheckItem"
parameter="sort_arrival"/>
</menu_item_check>
<menu_item_separator layout="topleft" />
<menu_item_check name="view_icons" label="View People Icons">
<menu_item_check.on_click