1 files changed, 32 insertions, 2 deletions

diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp
index f206474e71..e29be0c757 100644
--- a/indra/newview/llavatarlist.cpp
+++ b/indra/newview/llavatarlist.cpp
@@ -36,6 +36,7 @@
 #include "lltextutil.h"
 
 // newview
+#include "llagent.h"
 #include "llagentdata.h" // for comparator
 #include "llavatariconctrl.h"
 #include "llavatarnamecache.h"
@@ -119,6 +120,8 @@ static const LLFlatListView::ItemReverseComparator REVERSE_NAME_COMPARATOR(NAME_
 
 LLAvatarList::Params::Params()
 : ignore_online_status("ignore_online_status", false)
+, show_avatar_arrival_time("show_avatar_arrival_time", false)
+, show_avatar_distance("show_avatar_distance", false)
 , show_last_interaction_time("show_last_interaction_time", false)
 , show_info_btn("show_info_btn", true)
 , show_profile_btn("show_profile_btn", true)
@@ -131,6 +134,8 @@ LLAvatarList::LLAvatarList(const Params& p)
 :   LLFlatListViewEx(p)
 , mIgnoreOnlineStatus(p.ignore_online_status)
 , mShowLastInteractionTime(p.show_last_interaction_time)
+, mAvatarDistance(p.show_avatar_distance)
+, mAvatarArrivalTime(p.show_avatar_arrival_time)
 , mContextMenu(NULL)
 , mDirty(true) // to force initial update
 , mNeedUpdateNames(false)
@@ -148,7 +153,7 @@ LLAvatarList::LLAvatarList(const Params& p)
     // Set default sort order.
     setComparator(&NAME_COMPARATOR);
 
-    if (mShowLastInteractionTime)
+    if (mShowLastInteractionTime || mAvatarDistance || mAvatarArrivalTime)
     {
         mLITUpdateTimer = new LLTimer();
         mLITUpdateTimer->setTimerExpirySec(0); // zero to force initial update
@@ -197,9 +202,32 @@ void LLAvatarList::draw()
     if (mDirty)
         refresh();
 
-    if (mShowLastInteractionTime && mLITUpdateTimer->hasExpired())
+    if ((mShowLastInteractionTime || mAvatarDistance || mAvatarArrivalTime) && mLITUpdateTimer->hasExpired())
     {
+        if (mAvatarArrivalTime || mAvatarDistance)
+        {
+            std::vector<LLPanel*> items;
+            getItems(items);
+            for (auto it = items.begin(); it != items.end(); it++)
+            {
+                auto item = static_cast<LLAvatarListItem*>(*it);
+                if (mAvatarArrivalTime)
+                {
+                    auto secs_since = LLDate::now().secondsSinceEpoch() - LLRecentPeople::instance().getArrivalTimeByID(item->getAvatarId());
+                    if (secs_since >= 0)
+                        item->setAvatarArrivalTime(secs_since);
+                }
+                if (mAvatarDistance)
+                {
+                    auto avatarsPositions = gAgent.getAvatarsPositions();
+                    item->setAvatarDistance(dist_vec(avatarsPositions[item->getAvatarId()], gAgent.getPositionGlobal()));
+                }
+            }
+        }
+        if (mShowLastInteractionTime)
+        {
         updateLastInteractionTimes();
+        }
         mLITUpdateTimer->setTimerExpirySec(LIT_UPDATE_PERIOD); // restart the timer
     }
 }
@@ -428,6 +456,8 @@ void LLAvatarList::addNewItem(const LLUUID& id, const std::string& name, bool is
     // This sets the name as a side effect
     item->setAvatarId(id, mSessionID, mIgnoreOnlineStatus);
     item->setOnline(mIgnoreOnlineStatus ? true : is_online);
+    item->showAvatarArrivalTime(mAvatarArrivalTime);
+    item->showAvatarDistance(mAvatarDistance);
     item->showLastInteractionTime(mShowLastInteractionTime);
 
     item->setAvatarIconVisible(mShowIcons);