diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-08-19 20:36:17 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-08-19 22:35:01 +0800 |
commit | b7afbe59c42a3e6e92f712153172364f4ebaa5e2 (patch) | |
tree | b10784783099c002ed1cc8fd694915ade40b6e67 /indra/newview/skins/default/xui/en | |
parent | 495f103000137b3288eaa05a4298fd33ceb3c2dc (diff) | |
parent | 135fcd19541f414c3278b25b02b7bd34fbc3065f (diff) |
Merge branch 'webrtc-voice' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 17 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_mp_performance.xml b/indra/newview/skins/default/xui/en/floater_mp_performance.xml index 06dc4cabc6..d943a13f66 100644 --- a/indra/newview/skins/default/xui/en/floater_mp_performance.xml +++ b/indra/newview/skins/default/xui/en/floater_mp_performance.xml @@ -66,7 +66,7 @@ height="15" left="2" top="8"> - Buffer mapping + Optimisations: (needs restart): </text> @@ -85,13 +85,13 @@ value="1" /> <combo_box.item enabled="true" - label="Optimized (Apple GPU)" - name="Optimized" + label="Apple GPU (smoothie)" + name="Megapahit Optimisations" value="2" /> <combo_box.item enabled="true" - label="Experimental" - name="Experimental" + label="Apple GPU (LL)" + name="LL Optimisations" value="3" /> </combo_box> 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 ca6e94397d..122b5ae508 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 @@ -66,6 +66,17 @@ value="(loading)" width="180" /> <text + follows="left|right" + font="SansSerifSmall" + height="15" + layout="topleft" + left_pad="5" + name="avatar_distance" + top="6" + text_color="LtGray_50" + value="0m" + width="35" /> + <text follows="right" font="SansSerifSmall" height="15" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index c31e6c94ea..199609d57d 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_distance="true" right="-1" top="2" /> </layout_panel> |