Merge remote branch 'elektra/weekly' into weekly

4 files changed, 45 insertions, 23 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index b38bf9a..d33285d 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -10926,6 +10926,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+        <key>HighlightFriends</key>
+    <map>
+      <key>Comment</key>
+      <string>Display avatar name text in bold if is a friend</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>SnapEnabled</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index a2cba4c..fc6073a 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -91,6 +91,7 @@ BOOL LLPanelGeneral::postBuild()
         childSetValue("show_all_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitleAll"));
         childSetValue("show_my_name_checkbox", gSavedSettings.getBOOL("RenderNameHideSelf"));
         childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
+        childSetValue("highlight_friends_checkbox", gSavedSettings.getBOOL("HighlightFriends"));
         childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
         childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
         childSetValue("afk_timeout_checkbox", gSavedSettings.getBOOL("AllowIdleAFK"));
@@ -163,6 +164,7 @@ void LLPanelGeneral::apply()
         gSavedSettings.setBOOL("RenderHideGroupTitleAll", childGetValue("show_all_title_checkbox"));
         gSavedSettings.setBOOL("RenderNameHideSelf", childGetValue("show_my_name_checkbox"));
         gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
+        gSavedSettings.setBOOL("HighlightFriends", childGetValue("highlight_friends_checkbox"));
         gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
         gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
         gSavedSettings.setBOOL("AllowIdleAFK", childGetValue("afk_timeout_checkbox"));
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 6e16ea3..422b22f 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3801,15 +3801,20 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                         }
                         else
                         {
-                                static BOOL* sSmallAvatarNames = rebind_llcontrol<BOOL>("SmallAvatarNames", &gSavedSettings, true);
-                                if (*sSmallAvatarNames)
+                                S32 style = LLFontGL::NORMAL;
+
+                                if (!mIsSelf && gSavedSettings.getBOOL("HighlightFriends"))
                                 {
-                                        mNameText->setFont(LLFontGL::getFontSansSerif());
+                                        if (is_agent_friend(this->getID())) // Ele: bold for friends
+                                                style |= LLFontGL::BOLD;
                                 }
+
+                                static BOOL* sSmallAvatarNames = rebind_llcontrol<BOOL>("SmallAvatarNames", &gSavedSettings, true);
+                                if (*sSmallAvatarNames)
+                                        mNameText->setFont(LLFontGL::getFont(LLFontDescriptor("SansSerif","Medium",style)));
                                 else
-                                {
-                                        mNameText->setFont(LLFontGL::getFontSansSerifBig());
-                                }
+                                        mNameText->setFont(LLFontGL::getFont(LLFontDescriptor("SansSerif","Large",style)));
+
                                 mNameText->setTextAlignment(LLHUDText::ALIGN_TEXT_CENTER);
                                 mNameText->setFadeDistance(CHAT_NORMAL_RADIUS, 5.f);
                                 mNameText->setVisibleOffScreen(FALSE);
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 7b4b809..badd2b4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -44,6 +44,10 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide my name on my screen" left="151" name="show_my_name_checkbox"
              width="200" />
+        <check_box bottom_delta="-20" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Highlight friends tags" left="151" name="highlight_friends_checkbox"
+             width="200" />
         <text type="string" length="1" bottom_delta="-24" follows="left|top" font="SansSerifSmall" h_pad="0"
              halign="left" height="16" left="10" name="group_titles_textbox" v_pad="0"
              width="394">
@@ -57,34 +61,34 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Hide my group title" left="151" name="show_my_title_checkbox"
              radio_style="false" width="256" />
-  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-210"
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-230"
              can_apply_immediately="false" color="1 1 1 1"
              enabled="true" follows="left|top" height="65" label="" left="153"
              mouse_opaque="true" name="effect_color_swatch"
              tool_tip="Click to open Color Picker" width="55" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-215" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-235" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
     UI Size:
   </text>
-  <slider bottom="-217" can_edit_text="true"
+  <slider bottom="-237" can_edit_text="true"
              decimal_digits="3" enabled="true" height="16" increment="0.001"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
              name="ui_scale_slider" show_text="true" value="1" width="220" />
-  <button bottom="-221" enabled="true" follows="left|top"
+  <button bottom="-241" enabled="true" follows="left|top"
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Reset" left_delta="226" mouse_opaque="true"
              name="reset_ui_size" scale_image="true" width="80" />
-  <check_box bottom="-236" enabled="true" follows="left|top"
+  <check_box bottom="-256" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"
              name="ui_auto_scale" radio_style="false" width="256" />
-  <check_box bottom="-260" enabled="true" follows="left|top"
+  <check_box bottom="-280" enabled="true" follows="left|top"
                    font="SansSerifSmall" height="16" initial_value="false"
                    label="Go Away/AFK when idle" left="330" mouse_opaque="true"
                    name="afk_timeout_checkbox" radio_style="false" width="256" />
-  <spinner bottom="-260" decimal_digits="0" enabled="true"
+  <spinner bottom="-280" decimal_digits="0" enabled="true"
              follows="left|top" height="16" increment="1" initial_val="300"
              label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
@@ -105,18 +109,18 @@
        mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
        width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
                  Rating:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
              mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
                  I want to access content rated:
         </text>
-        <combo_box bottom="-318" follows="left|top" height="18" left="315"
+        <combo_box bottom="-338" follows="left|top" height="18" left="315"
              mouse_opaque="true" name="maturity_desired_combobox" width="150">
                 <combo_item name="Desired_Adult" value="42">
                         PG, Mature and Adult
@@ -129,7 +133,7 @@
                 </combo_item>
         </combo_box>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-332" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
              mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
                  PG only
@@ -147,25 +151,25 @@
                 Nametags:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-155" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-175" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="effects_color_textbox" v_pad="0" width="394">
                 Selection Beam Color:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-254" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-274" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="220"
              mouse_opaque="true" name="seconds_textbox" v_pad="0" width="128">
                 seconds
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-372" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
              mouse_opaque="true" name="time_textbox" v_pad="0" width="394">
                 Clock:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-384" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-404" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
              mouse_opaque="true" name="language_textbox" v_pad="0" width="394">
                 Language:
@@ -180,7 +184,7 @@
         <string name="region_name_prompt">
                 &lt;Type region name&gt;
         </string>
-        <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="false" bottom="-372" enabled="true" follows="left|top"
              height="18" left="153" max_chars="20" mouse_opaque="true"
              name="time_combobox" width="146">
                 <combo_item type="string" name="12HourTime" value="PST 12">
@@ -193,7 +197,7 @@
                         UTC
                 </combo_item>
         </combo_box>
-        <combo_box allow_text_entry="true" bottom="-382" enabled="true"
+        <combo_box allow_text_entry="true" bottom="-402" enabled="true"
              follows="left|top" height="16" left="153" max_chars="135"
              mouse_opaque="true" name="language_combobox" width="146">
                 <combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">