summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-08-21 13:55:07 +0800
committerErik Kundiman <erik@megapahit.org>2024-08-21 13:55:07 +0800
commit387bb8d4436f0262c1c9d319e9c1e87d6ecda82f (patch)
tree8bef90f71086269fc7ec7148cf6f193b3cc1db5a /indra/newview/skins
parent183e7dec6ae9fcf2b54c5c13b0e5363234656bdf (diff)
parent06bfcd7e75a2659ba4eb2dd79e89b8476a3c33cf (diff)
Merge branch 'main' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_avatar_list_item.xml11
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml1
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index 122b5ae508..cfca246321 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -71,6 +71,17 @@
height="15"
layout="topleft"
left_pad="5"
+ name="avatar_arrival_time"
+ top="6"
+ text_color="LtGray_50"
+ value="0s"
+ width="35" />
+ <text
+ follows="left|right"
+ font="SansSerifSmall"
+ height="15"
+ layout="topleft"
+ left_pad="5"
name="avatar_distance"
top="6"
text_color="LtGray_50"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 199609d57d..f1c03fdaa8 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -223,6 +223,7 @@ Learn about [https://community.secondlife.com/knowledgebase/joining-and-particip
keep_one_selected="false"
multi_select="true"
name="avatar_list"
+ show_avatar_arrival_time="true"
show_avatar_distance="true"
right="-1"
top="2" />