Merge tag 'Second_Life_Release#84f50b9d-26.2' into 2026.02

41 files changed, 115 insertions, 131 deletions

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index b2ca9cce75..5d99c35047 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -1115,7 +1115,14 @@ LLFontGL* LLFontGL::getFontSansSerifSmallItalic()
 //static
 LLFontGL* LLFontGL::getFontSansSerif()
 {
-    static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Medium",0));
+    static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif","Small",0));
+    return fontp;
+}
+
+// static
+LLFontGL* LLFontGL::getFontSansSerifMedium()
+{
+    static LLFontGL* fontp = getFont(LLFontDescriptor("SansSerif", "Medium", 0));
     return fontp;
 }
 
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 7743d61e40..3b82d8e43d 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -204,6 +204,7 @@ public:
     static LLFontGL* getFontSansSerifSmallBold();
     static LLFontGL* getFontSansSerifSmallItalic();
     static LLFontGL* getFontSansSerif();
+    static LLFontGL* getFontSansSerifMedium();
     static LLFontGL* getFontSansSerifBig();
     static LLFontGL* getFontSansSerifHuge();
     static LLFontGL* getFontSansSerifBold();
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index a107b263d8..890308ab54 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -170,7 +170,7 @@ LLFontDescriptor LLFontDescriptor::normalize() const
     if (new_size != s_template_string && new_size.empty() && findSubString(new_name,"Monospace"))
         new_size = "Monospace";
     if (new_size.empty())
-        new_size = "Medium";
+        new_size = "Small";
 
     if (removeSubString(new_name,"Bold"))
         new_style |= LLFontGL::BOLD;
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 05461edd82..9a27049d37 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -80,7 +80,7 @@ LLUICtrl::Params::Params()
     mouseenter_callback("mouseenter_callback"),
     mouseleave_callback("mouseleave_callback"),
     control_name("control_name"),
-    font("font", LLFontGL::getFontEmojiMedium()),
+    font("font", LLFontGL::getFontEmojiSmall()),
     font_halign("halign"),
     font_valign("valign"),
     length("length"),   // ignore LLXMLNode cruft
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fe88766a43..e2b917aa65 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5936,7 +5936,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>90</integer>
+      <integer>110</integer>
     </map>
     <key>NotificationChannelRightMargin</key>
     <map>
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
index 6d642638b3..73bce6f2fd 100644
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@@ -1056,7 +1056,7 @@ void LLFloaterIMSession::processAgentListUpdates(const LLSD& body)
                     if (moderator_muted_text)
                         label = LLTrans::getString("IM_muted_text_label");
                     else
-                        label = LLTrans::getString("IM_to_label") + " " + LLIMModel::instance().getName(mSessionID);
+                        label = LLIMModel::instance().getName(mSessionID);
                     mInputEditor->setLabel(label);
 
                     if (moderator_muted_text)
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 187dd3d8ff..3445b0a7cf 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -937,7 +937,7 @@ void LLFloaterIMSessionTab::hideOrShowTitle()
 
 void LLFloaterIMSessionTab::updateSessionName(const std::string& name)
 {
-    mInputEditor->setLabel(LLTrans::getString("IM_to_label") + " " + name);
+    mInputEditor->setLabel(name);
 }
 
 void LLFloaterIMSessionTab::updateChatIcon(const LLUUID& id)
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp
index 6c0b3bfa13..846642841a 100644
--- a/indra/newview/lltoastnotifypanel.cpp
+++ b/indra/newview/lltoastnotifypanel.cpp
@@ -46,7 +46,7 @@
 
 const S32 BOTTOM_PAD = VPAD * 3;
 const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding
-S32 BUTTON_WIDTH = 90;
+S32 BUTTON_WIDTH = 110;
 
 
 //static
@@ -362,8 +362,20 @@ void LLToastNotifyPanel::init( LLRect rect, bool show_images )
         }
         else
         {
-            const S32 button_panel_width = mControlPanel->getRect().getWidth();// do not change width of the panel
+            S32 button_panel_width = mControlPanel->getRect().getWidth();// get initial width from XML
             S32 button_panel_height = mControlPanel->getRect().getHeight();
+
+            // width for 3 columns: 3 buttons + 2 gaps
+            S32 min_width_required = 3 * BUTTON_WIDTH + 2 * (2 * HPAD);
+            if (min_width_required > button_panel_width)
+            {
+                button_panel_width = min_width_required;
+                S32 width_increase = button_panel_width - mControlPanel->getRect().getWidth();
+                reshape(getRect().getWidth() + width_increase, getRect().getHeight());
+                mInfoPanel->reshape(mInfoPanel->getRect().getWidth() + width_increase, mInfoPanel->getRect().getHeight());
+                mTextBox->reshape(mTextBox->getRect().getWidth() + width_increase, mTextBox->getRect().getHeight());
+            }
+
             //try get an average h_pad to spread out buttons
             S32 h_pad = (button_panel_width - buttons_width) / (S32(buttons.size()));
             if(h_pad < 2*HPAD)
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 2ca2c5c07d..a9aa63e68f 100644
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -200,7 +200,7 @@ LLFontGL* LLViewerChat::getChatFont()
             break;
         default:
         case 1:
-            fontp = LLFontGL::getFontSansSerif();
+            fontp = LLFontGL::getFontSansSerifMedium();
             break;
         case 2:
             fontp = LLFontGL::getFontSansSerifBig();
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
index 49e1397e9f..c756bc6969 100644
--- a/indra/newview/skins/default/xui/da/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/da/floater_joystick.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="JOYSTICK OPSÆTNING">
 	<check_box label="Aktiver Joystick:" name="enable_joystick"/>
-	<spinner label="X akse mapping" name="JoystickAxis1"/>
-	<spinner label="Y akse mapping" name="JoystickAxis2"/>
-	<spinner label="Z akse mapping" name="JoystickAxis0"/>
-	<spinner label="Hældning mapping" name="JoystickAxis4"/>
-	<spinner label="Drejning mapping" name="JoystickAxis5"/>
-	<spinner label="Rulning mapping" name="JoystickAxis3"/>
-	<spinner label="Zoom mapping" name="JoystickAxis6"/>
+	<spinner label="X akse mapping" name="JoystickAxis1" label_width="115" width="155"/>
+	<spinner label="Y akse mapping" name="JoystickAxis2" label_width="115" width="155"/>
+	<spinner label="Z akse mapping" name="JoystickAxis0" label_width="115" width="155"/>
+	<spinner label="Hældning mapping" name="JoystickAxis4" label_width="115" width="155"/>
+	<spinner label="Drejning mapping" name="JoystickAxis5" label_width="115" width="155"/>
+	<spinner label="Rulning mapping" name="JoystickAxis3" label_width="115" width="155"/>
+	<spinner label="Zoom mapping" name="JoystickAxis6" label_width="115" width="155"/>
 	<check_box label="Direkte zoom" name="ZoomDirect"/>
 	<check_box label="3D Cursor" name="Cursor3D"/>
 	<check_box label="Auto opret" name="AutoLeveling"/>
diff --git a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
index 443e84b64a..e05be4e310 100644
--- a/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/da/floater_whitelist_entry.xml
@@ -3,7 +3,7 @@
 	<text name="media_label">
 		Indtast en URL eller et URL mønster for at tilføje til listen med godkendte domæner
 	</text>
-	<line_editor name="whitelist_entry" tool_tip="Indtast en URL eller et URL mønster for at godkende side(r)"/>
+	<line_editor name="whitelist_entry" tool_tip="Indtast en URL eller et URL mønster for at godkende side(r)" bottom_delta="25"/>
 	<button label="OK" name="ok_btn"/>
 	<button label="Annullér" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
index 7caa17d514..fa245416cf 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_alerts.xml
@@ -4,6 +4,7 @@
 		Vis mig når:
 	</text>
 	<check_box label="Når jeg bruger eller får L$" name="notify_money_change_checkbox"/>
+    <check_box name="notify_money_spend_checkbox" left_delta="70"/>
 	<check_box label="Når mine venner logger på eller af" name="friends_online_notify_checkbox"/>
 	<text name="show_label">
 		Vis altid:
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
index 26d2ae4abd..acae39061b 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_sound.xml
@@ -30,7 +30,7 @@
 		<radio_item label="Avatar position" name="1"/>
 	</radio_group>
 	<check_box label="Bevæg avatar-læber når der snakkes" name="enable_lip_sync"/>
-	<check_box label="Skift tale tænd/sluk når jeg trykker:" name="push_to_talk_toggle_check" tool_tip="Når du er i skift-modus, vil hvert tryk tænde eller slukke din mikrofon. Når du ikke er i skift-modus, vil din mikrofon kun være tændt når knappen/tasten holdes nede (som en Walkie Talkie)"/>
+	<check_box label="Skift tale tænd/sluk når jeg trykker" name="push_to_talk_toggle_check" tool_tip="Når du er i skift-modus, vil hvert tryk tænde eller slukke din mikrofon. Når du ikke er i skift-modus, vil din mikrofon kun være tændt når knappen/tasten holdes nede (som en Walkie Talkie)"/>
 	<line_editor label="Tryk-for-tale udløser" name="modifier_combo"/>
 	<button label="Angiv taste" name="set_voice_hotkey_button"/>
 	<button name="set_voice_middlemouse_button" tool_tip="Nulstil til midterste muse-knap"/>
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 347b523a6b..ffb9c0f78e 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1593,7 +1593,7 @@ Only large parcels can be listed in search.
              left="10"
              name="with media:"
              top="10"
-             width="100">
+             width="110">
                 Type:
             </text>
             <combo_box
@@ -1620,7 +1620,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left="10"
              name="at URL:"
-             width="100"
+             width="110"
              top_pad="10">
                 Home Page:
             </text>
@@ -1632,7 +1632,7 @@ Only large parcels can be listed in search.
              max_length_bytes="255"
              name="media_url"
              select_on_focus="true"
-             width="300"
+             width="290"
              top_delta="0"/>
             <button
              follows="left|top"
@@ -1659,13 +1659,13 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="20"
              layout="topleft"
-             left="110"
+             left="120"
              max_length_bytes="255"
              name="url_description"
              select_on_focus="true"
              tool_tip="Text displayed next to play/load button"
              top_delta="0"
-             width="300" />
+             width="290" />
             <text
              type="string"
              length="1"
@@ -1685,7 +1685,7 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="80"
              layout="topleft"
-             left="110"
+             left="120"
              name="media texture"
              tool_tip="Click to choose a picture"
              top_delta="0"
@@ -1698,7 +1698,7 @@ Only large parcels can be listed in search.
              layout="topleft"
              left_pad="8"
              name="replace_texture_help"
-             width="300"
+             width="290"
              word_wrap="true"
              top_delta="0">
              Objects using this texture will show the movie or web page after you click the play arrow.  Select the thumbnail to choose a different texture.
@@ -1707,7 +1707,7 @@ Only large parcels can be listed in search.
              height="16"
              label="Auto scale"
              layout="topleft"
-             left="107"
+             left="117"
              name="media_auto_scale"
              top_pad="-10"
              tool_tip="Checking this option will scale the content for this parcel automatically. It may be slightly slower and lower quality visually but no other texture scaling or alignment will be required."
@@ -1721,7 +1721,7 @@ Only large parcels can be listed in search.
              left="10"
              name="media_size"
              tool_tip="Size to render Web media, leave 0 for default."
-             width="100"
+             width="110"
              top_pad="10">
                 Size:
             </text>
@@ -1776,7 +1776,7 @@ Only large parcels can be listed in search.
              left="10"
              name="Options:"
              top_pad="10"
-             width="100">
+             width="110">
                 Options:
             </text>
             <check_box
@@ -1786,7 +1786,7 @@ Only large parcels can be listed in search.
              left_pad="-3"
              name="media_loop"
              tool_tip="Play media in a loop.  When the media has finished playing, it will restart from the beginning."
-             top_delta="-1"
+             top_delta="1"
              width="200" />
         </panel>
         <panel
diff --git a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
index 870ddee554..308f4feb5a 100644
--- a/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
+++ b/indra/newview/skins/default/xui/en/floater_add_payment_method.xml
@@ -50,7 +50,6 @@
      follows="top|left|right"
      height="24"
      label="Get started"
-     font="SansSerifMedium"
      layout="topleft"
      left="320"
      name="continue_btn"
@@ -59,6 +58,7 @@
      image_hover_unselected="PushButton_Login_Over"
      label_color="White"
      top_pad ="15"
+     pad_bottom="1"
      width="140"/>
     <button
      follows="top|left|right"
@@ -66,6 +66,7 @@
      label="Later"
      layout="topleft"
      left_pad="9"
+     pad_bottom="1"
      name="close_btn"
      width="90"/>
     <icon
@@ -97,7 +98,6 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifMedium"
      text_color="White"
      height="75"
      width="260"
@@ -112,7 +112,6 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifMedium"
      text_color="White"
      height="75"
      width="260"
@@ -126,7 +125,6 @@
      type="string"
      length="1"
      follows="top|left"
-     font="SansSerifMedium"
      text_color="White"
      height="75"
      width="260"
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
index 889eeb5369..d6dc112dce 100644
--- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
+++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml
@@ -47,15 +47,15 @@
                           name="ambient_lbl"
                           height="10"
                           layout="topleft"
-                          left="10"
+                          left="7"
                           top="5"
-                          width="80">Ambient:</text>
+                          width="80">Ambient</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
                                   height="40"
                                   label_height="0"
                                   layout="topleft"
-                                  left_delta="0"
+                                  left_delta="3"
                                   name="ambient_light"
                                   top_pad="5"
                                   width="60"/>
@@ -63,15 +63,15 @@
                           name="blue_horizon_lbl"
                           height="10"
                           layout="topleft"
-                          left_delta="0"
+                          left="7"
                           top_pad="10"
-                          width="80">Blue Horizon:</text>
+                          width="80">Blue Horizon</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
                                   height="40"
                                   label_height="0"
                                   layout="topleft"
-                                  left_delta="0"
+                                  left_delta="3"
                                   name="blue_horizon"
                                   top_pad="5"
                                   width="60"/>
@@ -79,15 +79,15 @@
                           name="blue_density_lbl"
                           height="10"
                           layout="topleft"
-                          left_delta="0"
+                          left="7"
                           top_pad="10"
-                          width="80">Blue Density:</text>
+                          width="80">Blue Density</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
                                   height="40"
                                   label_height="0"
                                   layout="topleft"
-                                  left_delta="0"
+                                  left_delta="3"
                                   name="blue_density"
                                   top_pad="5"
                                   width="60"/>
@@ -107,7 +107,7 @@
                           layout="topleft"
                           right="-12"
                           top="5"
-                          width="60">Sun Color:</text>
+                          width="60">Sun Color</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
                                   height="10"
@@ -123,7 +123,7 @@
                           layout="topleft"
                           left_delta="0"
                           top_pad="5"
-                          width="80">Cloud Color:</text>
+                          width="80">Cloud Color</text>
                     <color_swatch can_apply_immediately="true"
                                   follows="left|top"
                                   height="10"
@@ -139,7 +139,7 @@
                           left_delta="0"
                           top_pad="10"
                           name="cloud_map_label"
-                          width="80">Cloud Image:</text>
+                          width="80">Cloud Image</text>
                     <texture_picker height="63"
                                     layout="topleft"
                                     left_delta="0"
@@ -152,7 +152,7 @@
                           left_delta="0"
                           top_pad="-13"
                           name="water_map_label"
-                          width="80">Water Image:</text>
+                          width="80">Water Image</text>
                     <texture_picker height="63"
                                     layout="topleft"
                                     left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index e8e83301be..5e0903a40f 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -93,7 +93,6 @@
        type="string"
        length="1"
        follows="top|left"
-       font="SansSerifMedium"
        height="16"
        layout="topleft"
        left="20"
@@ -105,7 +104,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        follows="top|left"
        halign="right"
        height="16"
@@ -128,7 +126,6 @@
        type="string"
        length="1"
        follows="top|left"
-       font="SansSerifMedium"
        height="16"
        layout="topleft"
        left="20"
@@ -140,7 +137,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        follows="top|left"
        halign="right"
        height="16"
@@ -163,7 +159,6 @@
         type="string"
         length="1"
         follows="top|left"
-        font="SansSerifMedium"
         font.style="BOLD"
         height="16"
         layout="topleft"
@@ -176,7 +171,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        follows="top|left"
        halign="right"
        height="16"
@@ -207,7 +201,6 @@
        type="string"
        length="1"
        follows="top|left"
-       font="SansSerifMedium"
        height="16"
        top_pad="15"
        layout="topleft"
@@ -217,7 +210,6 @@
           Choose amount to buy
       </text>
       <text
-       font="SansSerifMedium"
        type="string"
        length="1"
        follows="left|top"
@@ -233,7 +225,6 @@
        type="string"
        max_length_bytes="10"
        halign="right"
-       font="SansSerifMedium"
        select_on_focus="true"
        follows="top|left"
        top_delta="-4"
@@ -247,7 +238,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        text_color="EmphasisColor"
        follows="top|left"
        halign="right"
@@ -276,7 +266,6 @@
       </text>
       <text
        type="string"
-       font="SansSerifMedium"
        length="1"
        follows="top|left"
        height="16"
@@ -290,7 +279,6 @@
       <text
        type="string"
        length="1"
-       font="SansSerifMedium"
        follows="top|left"
        top_delta="0"
        height="16"
@@ -350,7 +338,6 @@ Re-enter amount to see the latest exchange rate.
        length="1"
        follows="top|left"
        layout="topleft"
-       font="SansSerifMedium"
        top="10"
        left="20"
        width="310"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 787b2f8be4..b911e9b6f5 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -290,7 +290,7 @@
                                 <button
                                         follows="top|left"
                                         height="23"
-                                        width="110"
+                                        width="113"
                                         label="Clone Track From"
                                         left="10"
                                         top_pad="10"
@@ -298,7 +298,7 @@
                                 <button
                                         follows="top|left"
                                         height="23"
-                                        width="110"
+                                        width="113"
                                         label="Load Track From"
                                         top_pad="0"
                                         left_delta="0"
@@ -306,7 +306,7 @@
                                 <button
                                         follows="top|left"
                                         height="23"
-                                        width="110"
+                                        width="113"
                                         label="Clear Track"
                                         top_pad="0"
                                         left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml
index 7097689118..e94669bba4 100644
--- a/indra/newview/skins/default/xui/en/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml
@@ -526,7 +526,7 @@
              height="16"
              label="Disable Physics"
              layout="topleft"
-             left_delta="120"
+             left_delta="136"
              name="disable physics"
              tool_tip="Set this to disable all physics in this region"
              top_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index 9d2ed43756..5dd3dfa2bf 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -27,7 +27,6 @@
    left_pad="12"
    top_delta="2"
    name="multi_folder_txt"
-   font="SansSerifMedium"
    text_color="White"
    width="300">
    Double-click on folder in multi-folder view:
@@ -37,7 +36,6 @@
   follows="left|top"
   top_pad="8"
   layout="topleft"
-  font="SansSerifMedium"
   left="60"
   width="300"
   height="66"
@@ -90,7 +88,6 @@
    left_pad="12"
    top_delta="2"
    name="single_folder_txt"
-   font="SansSerifMedium"
    text_color="White"
    width="300">
    Double-click on folder in single-folder view:
@@ -100,7 +97,6 @@
   follows="left|top"
   top_pad="8"
   layout="topleft"
-  font="SansSerifMedium"
   left="60"
   width="300"
   height="44"
@@ -142,7 +138,6 @@
    layout="topleft"
    left_pad="13"
    name="find_original_txt"
-   font="SansSerifMedium"
    text_color="White"
    top_delta="1"
    width="310">
@@ -153,7 +148,6 @@
   follows="left|top"
   top_pad="8"
   layout="topleft"
-  font="SansSerifMedium"
   left="60"
   width="300"
   height="44"
@@ -196,7 +190,6 @@
    left_pad="12"
    top_delta="2"
    name="favorites_txt"
-   font="SansSerifMedium"
    text_color="White"
    width="300">
    Favorites
@@ -206,7 +199,6 @@
    layout="topleft"
    follows="left|top"
    top_pad="8"
-   font="SansSerifMedium"
    left="60"
    width="300"
    height="18"
@@ -219,7 +211,6 @@
    follows="left|top"
    top_pad="5"
    layout="topleft"
-   font="SansSerifMedium"
    left="60"
    width="150"
    height="18"
@@ -232,7 +223,6 @@
    follows="left|top"
    top_pad="5"
    layout="topleft"
-   font="SansSerifMedium"
    left="60"
    width="150"
    height="18"
@@ -276,7 +266,6 @@
    left_pad="12"
    top_delta="2"
    name="single_folder_txt"
-   font="SansSerifMedium"
    text_color="White"
    width="300">
    Pressing enter on an avatar attachment
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index a023f2064f..fb828b804a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -1407,7 +1407,7 @@
           follows="top|left"
           height="15"
           layout="topleft"
-          left="220"
+          left="240"
           name="pelvis_offset_label"
           text_color="White"
           top="8"
@@ -1421,12 +1421,13 @@
           max_val="3.0"
           name="pelvis_offset"
           top_pad="10"
+          left="340"
           value="0.0"
           width="80"/>
         <text
           follows="top|left"
           height="17"
-          left="425"
+          left="435"
           name="skin_too_many_joints"
           text_color="Orange"
           top="7"
@@ -1437,7 +1438,7 @@
         <text
           follows="top|left"
           height="32"
-          left="425"
+          left="435"
           name="skin_unknown_joint"
           text_color="Orange"
           top="8"
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 0e37472990..3bb1a9f1e2 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -672,7 +672,7 @@
     increment="8"
     initial_value="160"
     label="Sky:"
-    label_width="145"
+    label_width="164"
     layout="topleft"
     left="420"
     min_val="16"
@@ -758,7 +758,7 @@
    control_name="RenderShadowDetail"
    height="18"
    layout="topleft"
-   left_delta="130"
+   left_delta="175"
    top_delta="0" 
    name="ShadowDetail"
    width="150">
@@ -812,7 +812,7 @@
    control_name="RenderReflectionProbeDetail"
    height="18"
    layout="topleft"
-   left_delta="130"
+   left_delta="175"
    top_delta="0"
    name="ReflectionDetail"
    width="150">
@@ -848,7 +848,7 @@
    control_name="RenderReflectionProbeLevel"
    height="18"
    layout="topleft"
-   left_delta="130"
+   left_delta="175"
    top_delta="0"
    name="ReflectionLevel"
    width="150">
@@ -880,7 +880,7 @@
       name="ReflectionProbeCount"
       text_readonly_color="LabelDisabledColor"
       top_delta="22"
-      width="128">
+      width="130">
         Max Reflection Probes:
     </text>
 
@@ -889,7 +889,7 @@
      height="18"
      layout="topleft"
      label="Max. Reflection Probes:"
-     left_delta="130"
+     left_delta="175"
      top_delta="0"
      name="ProbeCount"
      width="150">
@@ -923,7 +923,7 @@
     increment="0.1"
     initial_value="160"
     label="Exposure:"
-    label_width="145"
+    label_width="164"
     layout="topleft"
     left="420"
     min_val="0.5"
@@ -967,7 +967,7 @@
    control_name="RenderHeroProbeResolution"
    height="18"
    layout="topleft"
-   left_delta="130"
+   left_delta="175"
    top_delta="0"
    name="MirrorResolution"
    width="150">
@@ -1007,7 +1007,7 @@
    control_name="RenderHeroProbeUpdateRate"
    height="18"
    layout="topleft"
-   left_delta="130"
+   left_delta="175"
    top_delta="0"
    name="HeroProbeUpdateRate"
    width="150">
@@ -1038,7 +1038,7 @@
     increment="0.1"
     initial_value="160"
     label="Sharpening:"
-    label_width="145"
+    label_width="164"
     layout="topleft"
     left="420"
     min_val="0.0"
@@ -1067,7 +1067,7 @@
     control_name="RenderTonemapType"
     height="18"
     layout="topleft"
-    left_delta="130"
+    left_delta="175"
     top_delta="0"
     name="TonemapType"
     width="150">
@@ -1089,7 +1089,7 @@
    initial_value="1"
    label="Tone Mapping Mix:"
    tool_tip="Mix between linear and tone mapped colors"
-   label_width="145"
+   label_width="164"
    layout="topleft"
    left="420"
    min_val="0.0"
diff --git a/indra/newview/skins/default/xui/en/floater_test_slapp.xml b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
index 5a13a0147e..35f5961285 100644
--- a/indra/newview/skins/default/xui/en/floater_test_slapp.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
@@ -17,7 +17,6 @@
     follows="left|top|right"
     height="16"
     name="trusted_txt"
-    font="SansSerifMedium"
     text_color="white"
     layout="topleft"
     left="16">
diff --git a/indra/newview/skins/default/xui/en/floater_test_textbox.xml b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
index 023df69f0f..e736fc58b2 100644
--- a/indra/newview/skins/default/xui/en/floater_test_textbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_textbox.xml
@@ -99,7 +99,7 @@
  font.name="SansSerifSmall"
  name="test_text10"
  tool_tip="text">
-    SansSerifSmall
+    SansSerif
     The 华文细黑 brown fox ヒラキjumped over the lazy dog.
   </text>
   <text
@@ -111,7 +111,7 @@
    font.name="SansSerifMedium"
    name="test_text11"
    tool_tip="text">
-    SansSerif
+    SansSerifMedium
     The 华文细黑 brown fox ヒラキjumped over the lazy dog.
   </text>
   <text
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index 64c97b1a11..d75d2e0db7 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -16,7 +16,6 @@
   width="650">
   <text
     follows="left|top"
-    font="SansSerifMedium"
     valign="top"
     halign="left"
     height="20"
@@ -31,7 +30,6 @@
   </text>
   <text
     follows="left|top"
-    font="SansSerifMedium"
     valign="top"
     halign="left"
     height="20"
@@ -49,7 +47,7 @@
     button_display_mode="icons_with_text"
     follows="all"
     left="20"
-    button_icon_and_text.button_width.max="145"
+    button_icon_and_text.button_width.max="172"
     button_icon_and_text.button_width.min="70"
     name="toybox_toolbar"
     pad_left="5"
diff --git a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
index 4e75b2b29c..fdc1e64e05 100644
--- a/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/en/floater_whitelist_entry.xml
@@ -10,12 +10,12 @@
  title="WHITELIST ENTRY"
  width="390">
 
-  <text type="string" length="1" bottom="20" follows="top|left" height="15" layout="topleft"
-     left="10" name="media_label" top="20">
+    <text type="string" length="1" follows="top|left|right" height="30" layout="topleft"
+     left="10" name="media_label" top="20" right="-10" word_wrap="true">
         Enter a URL or URL pattern to add to the list of allowed domains
     </text>
 
-  <line_editor bottom_delta="40" enabled="true" follows="left|top" font="SansSerif"
+  <line_editor bottom_delta="15" enabled="true" follows="left|top" font="SansSerif"
 	     height="20" left="10" name="whitelist_entry"
 	     tool_tip="Enter a URL or URL pattern to White List"
 	     width="350" />
diff --git a/indra/newview/skins/default/xui/en/panel_gltf_material.xml b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
index 1e4925a141..697c6e60b7 100644
--- a/indra/newview/skins/default/xui/en/panel_gltf_material.xml
+++ b/indra/newview/skins/default/xui/en/panel_gltf_material.xml
@@ -252,7 +252,7 @@
       layout="topleft"
       left_delta="0"
       top_pad="5"
-      width="102"
+      width="105"
       name="roughness_factor_lbl">
       Roughness Factor
     </text>
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 3428991460..d97411f5ab 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -64,8 +64,7 @@ Hover your mouse over the options for more help.
      use_ellipses="true"
      width="168" />
     <text
-    font="SansSerifMedium"
-    text_color="white"
+     text_color="white"
      type="string"
      follows="left|top"
      height="16"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index b1d5086a29..2ecc4585ba 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -276,7 +276,6 @@ Maximum 200 per group daily
     width="313">
         <text
          type="string"
-         font="SansSerifMedium"
          height="16"
          layout="topleft"
          left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
index 7442136761..741ed5af41 100644
--- a/indra/newview/skins/default/xui/en/panel_hint.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint.xml
@@ -3,7 +3,6 @@
  width="205"
  height="34">
   <text name="hint_title"
-        font="SansSerifMedium" 
         left="8"
         right="180"
         top="8"
diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml
index d712245df8..3e3205531f 100644
--- a/indra/newview/skins/default/xui/en/panel_hint_image.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint_image.xml
@@ -4,7 +4,6 @@
  height="40"
  layout="topleft">
   <text name="hint_title"
-        font="SansSerifMedium" 
         left="8"
         right="290"
         top="8"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 77fcb25692..482cbef236 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -271,7 +271,7 @@
                  <combo_box.drop_down_button
                   pad_bottom="1"
                   pad_left="10"
-                  font="SansSerif"
+                  font="SansSerifLarge"
                   label_color="Black"
                   label_color_selected="Black"
                   draw_focus_border="false"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index 6e1e6facbe..a302d44e83 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -34,7 +34,6 @@
   	 left="12"
   	 right="-12"
      name="ItemcountText"
-     font="SansSerifMedium"
      text_color="InventoryItemLinkColor"
      use_ellipses="true"
      top_pad="0">
diff --git a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
index 61cd6a83d4..371147b28a 100644
--- a/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
+++ b/indra/newview/skins/default/xui/en/panel_marketplace_listings.xml
@@ -108,7 +108,6 @@
           left="2"
           width="306"
           halign="center"
-          font="SansSerifMedium"
           font_shadow="hard"
           valign="top">
           Drop folders here to create new listings
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 6515ab7c17..86ec799996 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -21,14 +21,14 @@
    increment="64"
    initial_value="1024"
    label="Cache size (896 - 32768MB)"
-   label_width="161"
+   label_width="170"
    layout="topleft"
    left="33"
    max_val="32768"
    min_val="896"
    top_pad="10"
    name="cachesizespinner"
-   width="221" />
+   width="230" />
   <text
    type="string"
    length="1"
@@ -47,7 +47,7 @@
    label="Clear Cache"
    label_selected="Clear Cache"
    layout="topleft"
-   left_pad="20"
+   left_pad="25"
    name="clear_cache"
    top_delta="0"
    width="100">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 36c3b2dedd..1dcbf4e666 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -327,7 +327,7 @@
    control_name="MediaSoundsEarLocation"
    follows="left|top"
    layout="topleft"
-   left_pad="5"
+   left_pad="10"
    width="130"
    height="23"
    top_delta="-4"
@@ -357,7 +357,7 @@
         follows="left|top"
         layout="topleft"
         height="23"
-        left_delta="185"
+        left_delta="190"
         top_delta="-4"
         name="media_auto_play_combo"
         width="130">
@@ -390,7 +390,7 @@
     follows="left|top"
     layout="topleft"
     height="23"
-    left_delta="185"
+    left_delta="190"
     top_delta="-4"
     width="130"
     name="media_first_interact_combo"
@@ -458,7 +458,7 @@
    layout="topleft"
    follows="left"
    height="15"
-   width="180"
+   width="187"
    name="noise_suppression_label"
    left="23"
    top_delta="22"
@@ -470,7 +470,7 @@
    enabled_control="EnableVoiceChat"
    follows="left|top"
    layout="topleft"
-   left_delta="185"
+   left_delta="190"
    top_delta="-6"
    width="130"
    height="23"
@@ -514,7 +514,7 @@
    control_name="VoiceEarLocation"
    follows="left|top"
    layout="topleft"
-   left_delta="185"
+   left_delta="190"
    top_delta="-6"
    width="130"
    height="23"
@@ -546,7 +546,7 @@
    tool_tip="Check to enable voice echo cancellation"
    label="Echo Cancellation"
    layout="topleft"
-   left="270"
+   left="275"
    name="enable_echo_cancellation"
    top_pad="-15"
    width="200"/>
@@ -570,7 +570,7 @@
    label="Automatic Gain Control"
    layout="topleft"
    name="voice_automatic_gain_control"
-   left="270"
+   left="275"
    top_pad="-15"
    width="200"/>
   <check_box
@@ -592,7 +592,7 @@
    label="Show voice dot above avatars"
    layout="topleft"
    name="voice_dot_visualizer"
-   left="270"
+   left="275"
    top_pad="-15"
    width="200"/>
   <button
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index bc5a64a209..c03d6a9745 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -35,7 +35,7 @@
                     layout="topleft"
                     left_delta="15"
                     top_pad="15"
-                    width="80">
+                    width="86">
                 Ambient Color:
             </text>
             <color_swatch
@@ -53,9 +53,9 @@
                     follows="left"
                     height="10"
                     layout="topleft"
-                    left_delta="90"
+                    left_delta="110"
                     top_delta="-15"
-                    width="80">
+                    width="86">
                 Blue Horizon:
             </text>
             <color_swatch
@@ -73,9 +73,9 @@
                     follows="left"
                     height="10"
                     layout="topleft"
-                    left_delta="90"
+                    left_delta="110"
                     top_delta="-15"
-                    width="80">
+                    width="86">
                 Blue Density:
             </text>
             <color_swatch
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
index de47e05291..3fc22d69ca 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml
@@ -69,7 +69,6 @@
                      <button
                         control_name="InventoryInboxToggleState"
                         label="Received items"
-                        font="SansSerifMedium"
                         name="inbox_btn"
                         height="35"
                         image_unselected="MarketplaceBtn_Off"
@@ -92,7 +91,6 @@
                         top="10"
                         right="-20"
                         name="inbox_fresh_new_count"
-                        font="SansSerifMedium"
                         halign="right"
                         top_pad="0">
                         [NUM] new
diff --git a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
index ea49b750d1..6824080b49 100644
--- a/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/panel_camera_item.xml
@@ -55,7 +55,6 @@
      width="30" />
   <panel_camera_item.text
    follows="top|left|right"
-     font="SansSerifMedium"
      height="15"
      layout="topleft"
      left ="38"
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 95b2a3866d..0447c18a33 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -21,7 +21,7 @@
                         image_disabled_selected="PushButton_Selected_Disabled"
                         image_disabled="PushButton_Disabled"
                         button_width.min="70"
-                        button_width.max="145"
+                        button_width.max="172"
                         desired_height="24"
                         pad_left="10" 
                         pad_right="10"
diff --git a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
index 64be14a69c..a0b119ed72 100644
--- a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <inventory_list_item
   follows="top|right|left"
-  height="20"
+  height="21"
   name="inventory_item"
   tab_stop="false" 
   hover_image="ListItem_Over"
@@ -25,7 +25,7 @@
     layout="topleft"
     left="0"
     name="item_icon"
-    top="0"
+    top="1"
     width="16" />
   <item_name
     follows="left|right"
@@ -36,7 +36,7 @@
     use_ellipses="true"
     name="item_name"
     text_color="white"
-    top="1"
+    top="2"
     value="..."
     width="359" />
     <add_btn