From 70956fb2dbc42501d27a474e3f80003d591ee646 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sat, 14 Oct 2023 00:11:06 +0200
Subject: SL-20163 Allow residents to hide exact join date on profiles

---
 indra/newview/llpanelavatar.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llpanelavatar.h')

diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index f182660c8e..572e1eb029 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -92,7 +92,7 @@ public:
     /**
      * Returns avatar ID.
      */
-    virtual const LLUUID& getAvatarId() { return mAvatarId; }
+    virtual const LLUUID& getAvatarId() const { return mAvatarId; }
 
     /**
      * Sends update data request to server.
@@ -133,6 +133,8 @@ protected:
 
     const bool getSelfProfile() const { return mSelfProfile; }
 
+    bool saveAgentUserInfoCoro(std::string name, LLSD value) const;
+
 public:
     void setIsLoading() { mLoadingState = PROFILE_LOADING; }
     void resetLoading() { mLoadingState = PROFILE_INIT; }
-- 
cgit v1.2.3


From 69aa02d2e1873970302942487b96d3a6aca119e5 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 24 Oct 2023 23:02:56 +0300
Subject: SL-20513 Make profile floater use properties processor #3

---
 indra/newview/llpanelavatar.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llpanelavatar.h')

diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 572e1eb029..1106c44734 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -97,12 +97,12 @@ public:
     /**
      * Sends update data request to server.
      */
-    virtual void updateData() {};
+    virtual void updateData(){};
 
     /**
      * Clears panel data if viewing avatar info for first time and sends update data request.
      */
-    virtual void onOpen(const LLSD& key);
+    virtual void onOpen(const LLSD& key) override;
 
     /**
      * Clears all data received from server.
@@ -160,12 +160,14 @@ public:
     LLPanelProfilePropertiesProcessorTab();
     ~LLPanelProfilePropertiesProcessorTab();
 
-    /*virtual*/ void setAvatarId(const LLUUID& avatar_id);
+    void setAvatarId(const LLUUID& avatar_id) override;
+
+    void updateData() override;
 
     /**
      * Processes data received from server via LLAvatarPropertiesObserver.
      */
-    virtual void processProperties(void* data, EAvatarProcessorType type) = 0;
+    virtual void processProperties(void* data, EAvatarProcessorType type) override = 0;
 };
 
 #endif // LL_LLPANELAVATAR_H
-- 
cgit v1.2.3


From 7838c14d871529b39e0fdf63088ac7640478605c Mon Sep 17 00:00:00 2001
From: Andrey Lihatskiy <alihatskiy@productengine.com>
Date: Mon, 18 Dec 2023 22:02:14 +0200
Subject: SL-18058 Post-merge functionality restore

---
 indra/newview/llpanelavatar.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llpanelavatar.h')

diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 1106c44734..ec620b39e1 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -133,7 +133,7 @@ protected:
 
     const bool getSelfProfile() const { return mSelfProfile; }
 
-    bool saveAgentUserInfoCoro(std::string name, LLSD value) const;
+    bool saveAgentUserInfoCoro(std::string name, LLSD value, std::function<void(bool)> callback = nullptr) const;
 
 public:
     void setIsLoading() { mLoadingState = PROFILE_LOADING; }
-- 
cgit v1.2.3