Merge branch 'main' into 2024.06-atlasaurus

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index 81486690c9..37ad578a20 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -50,6 +50,7 @@ public:
     struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params>
     {
         Optional<bool>  ignore_online_status, // show all items as online
+                        show_avatar_arrival_time,
                         show_avatar_distance,
                         show_last_interaction_time, // show most recent interaction time. *HACK: move this to a derived class
                         show_info_btn,
@@ -111,6 +112,7 @@ protected:
         const uuid_vec_t& vnew,
         uuid_vec_t& vadded,
         uuid_vec_t& vremoved);
+    void updateAvatarArrivalTime();
     void updateAvatarDistance();
     void updateLastInteractionTimes();
     void rebuildNames();
@@ -120,6 +122,7 @@ protected:
 private:
 
     bool mIgnoreOnlineStatus;
+    bool mAvatarArrivalTime;
     bool mAvatarDistance;
     bool mShowLastInteractionTime;
     bool mDirty;