SL-15297 WIP update Individual settings panel & correctly show avatar state in the list

2 files changed, 131 insertions, 21 deletions

diff --git a/indra/newview/llfloaterperformance.cpp b/indra/newview/llfloaterperformance.cpp
index b8adf7fedc..16afeb6e52 100644
--- a/indra/newview/llfloaterperformance.cpp
+++ b/indra/newview/llfloaterperformance.cpp
@@ -306,7 +306,7 @@ void LLFloaterPerformance::populateNearbyList()
     while (char_iter != valid_nearby_avs.end())
     {
         LLVOAvatar* avatar = dynamic_cast<LLVOAvatar*>(*char_iter);
-        if (avatar)
+        if (avatar && (LLVOAvatar::AOA_INVISIBLE != avatar->getOverallAppearance()))
         {
             LLSD item;
             item["id"] = avatar->getID();
@@ -336,7 +336,7 @@ void LLFloaterPerformance::populateNearbyList()
                 if (name_text)
                 {
                     std::string color = "white";
-                    if ((max_render_cost != 0) && (avatar->getVisualComplexity() > max_render_cost))
+                    if (LLVOAvatar::AOA_JELLYDOLL == avatar->getOverallAppearance())
                     {
                         color = "LabelDisabledColor";
                         LLScrollListBar* bar = dynamic_cast<LLScrollListBar*>(av_item->getColumn(0));
@@ -345,9 +345,9 @@ void LLFloaterPerformance::populateNearbyList()
                             bar->setColor(LLUIColorTable::instance().getColor(color));
                         }
                     }
-                    else if (LLAvatarActions::isFriend(avatar->getID()))
+                    else if (LLVOAvatar::AOA_NORMAL == avatar->getOverallAppearance())
                     {
-                        color = "ConversationFriendColor";
+                        color =  LLAvatarActions::isFriend(avatar->getID()) ? "ConversationFriendColor" : "white";
                     }
                     name_text->setColor(LLUIColorTable::instance().getColor(color));
                 }
diff --git a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
index ec1b624f13..b5cc2a29ed 100644
--- a/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/en/panel_performance_preferences.xml
@@ -2,7 +2,7 @@
 <panel
  bevel_style="none"
  follows="left|top"
- height="510"
+ height="520"
  width="580"
  name="panel_performance_preferences"
  layout="topleft"
@@ -57,7 +57,7 @@
    text_color="White"
    height="18"
    layout="topleft"
-   top_pad="20"
+   top_pad="30"
    name="quality_lbl"
    width="100">
     Graphics quality
@@ -74,21 +74,60 @@ shortcuts
    width="40">
     Fastest
   </text>
-  <slider
-    control_name="RenderQualityPerformance"
-    decimal_digits="0"
-    follows="left|top"
-    height="16"
-    increment="1"
-    initial_value="0"
-    layout="topleft"
-    left_pad="5"
-    max_val="6"
-    name="graphics_quality"
-    show_text="false"
-    top_delta="-1"
-    width="275">
-  </slider>
+  <radio_group
+   control_name="RenderQualityPerformance"
+   follows="top|left"
+   draw_border="false"
+   height="25"
+   layout="topleft"
+   left_pad="5"
+   name="graphics_quality"
+   top_delta="0"
+   width="243">
+    <radio_item
+     height="16"
+     layout="topleft"
+     left="3"
+     name="0"
+     top="0"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="1"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="2"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="3"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="4"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="5"
+     width="7" />
+    <radio_item
+     height="16"
+     layout="topleft"
+     left_pad="30"
+     name="6"
+     width="7" />
+  </radio_group>
   <text
    follows="left|top"
    font="SansSerifSmall"
@@ -383,4 +422,75 @@ shortcuts
     name="advanced_btn"
     top_pad="12"
     width="200"/>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   top="78"
+   left="213"
+   name="1_lbl"
+   width="7">
+    1
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="31"
+   name="2_lbl"
+   width="7">
+    2
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="3_lbl"
+   width="7">
+    3
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="4_lbl"
+   width="7">
+    4
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="5_lbl"
+   width="7">
+    5
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="6_lbl"
+   width="7">
+      6
+  </text>
+  <text
+   follows="left|top"
+   font="SansSerifSmall"
+   height="18"
+   layout="topleft"
+   left_pad="30"
+   name="7_lbl"
+   width="7">
+    7
+  </text>
 </panel>