From ab3d986ac82e6c54804e8216d8ba2f72f8e8dfc8 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 31 May 2022 22:41:21 +0300
Subject: SL-15312 Tweaks and fixes #2

- changed 'is friend' color
- fixed off/online status vanishing
- changed user name format
- fixed rights behavior
- cleaned up some unused code
- readded click functionality to permission icons (might need to return buttons instead)
---
 .../skins/default/xui/en/panel_profile_secondlife.xml  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 853e782de1..7dd16de0ed 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -10,8 +10,8 @@
  layout="topleft"
 >
    <string 
-    name="AgeFormat"
-    value="[AGE]" />
+    name="NameAgeFormat"
+    value="[NAME] ([AGE])" />
    <string
     name="partner_text"
     value="Partner: [LINK]" />
@@ -99,17 +99,7 @@ Account: [ACCTTYPE]
            layout="topleft"/>
           
           <text
-           name="user_name"
-           value="(loading...)"
-           top_pad="0"
-           left_delta="0"
-           right="-1"
-           height="16"
-           follows="left|top|right"
-           layout="topleft"/>
-
-          <text
-           name="user_age"
+           name="user_name_age"
            value="(loading...)"
            top_pad="0"
            left_delta="0"
@@ -171,7 +161,7 @@ Account: [ACCTTYPE]
               <text
                name="frind_text"
                value="You are friends"
-               text_color="Green"
+               text_color="ConversationFriendColor"
                top="0"
                left="0"
                right="-1"
-- 
cgit v1.2.3