From 17420cffcb0859eb1fe4a7a141ee47e12b8c0c3d Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.com>
Date: Wed, 7 Aug 2024 19:02:44 +0200
Subject: megapahit tuning : return of the smoothie

This commit reintroduces the meapahit specic optimisations while maintaining an option for
the LL vertex buffer optimisation mode.
---
 indra/newview/skins/default/xui/en/floater_mp_performance.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

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>
 
-- 
cgit v1.2.3


From d15ebf5623fe15677a59a66029e9cfd00edc2942 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 17 Aug 2024 13:23:01 +0800
Subject: Distance in nearby tab (draft)

https://megapahit.com/show_bug.cgi?id=49
Still needs to be tidied up. For now it's aligned to the left.
If you want to align it to the right, apart from modifying
avatar_distance in panel_avatar_list_item.xml to look more like
last_interaction, modify newview/llavatarlistitem.cpp line 555
to be something like:
`S32 avatar_distance_width = avatar_item->mLastInteractionTime->getRect().mLeft - avatar_item->mAvatarDistance->getRect().mLeft;`
I had tried this at first, but I couldn't make it look good and
that's why I aligned it to the left.

Also, these distances need to not be shown on Friends list.
I'm doing that next.
---
 indra/newview/skins/default/xui/en/panel_avatar_list_item.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/skins')

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
@@ -65,6 +65,17 @@
      use_ellipses="true"
      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"
-- 
cgit v1.2.3


From b1c0b309421b76c1e39bff76439e9c0d6391d7ad Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sat, 17 Aug 2024 14:54:09 +0800
Subject: Show avatar distance only on nearby list

---
 indra/newview/skins/default/xui/en/panel_people.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

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>
-- 
cgit v1.2.3