Merge pull request #2652 from secondlife/lua-merge-dev2

Merge develop into release/luau-scripting

21 files changed, 686 insertions, 670 deletions

diff --git a/indra/newview/skins/default/xui/da/language_settings.xml b/indra/newview/skins/default/xui/da/language_settings.xml
index 0e3cbfd2d2..d31afb320a 100644
--- a/indra/newview/skins/default/xui/da/language_settings.xml
+++ b/indra/newview/skins/default/xui/da/language_settings.xml
@@ -5,6 +5,7 @@
 	<!-- Locale Information -->
 	<string name="MicrosoftLocale">danish</string>
 	<string name="MacLocale">da_DK.UTF-8</string>
+	<string name="macOSLocale">da_DK.UTF-8</string>
 	<string name="DarwinLocale">da_DK.UTF-8</string>
 	<string name="LinuxLocale">da_DK.UTF-8</string>
 	
diff --git a/indra/newview/skins/default/xui/de/language_settings.xml b/indra/newview/skins/default/xui/de/language_settings.xml
index f9346eef7d..57a327b345 100644
--- a/indra/newview/skins/default/xui/de/language_settings.xml
+++ b/indra/newview/skins/default/xui/de/language_settings.xml
@@ -5,6 +5,7 @@
 	<!-- Locale Information -->
 	<string name="MicrosoftLocale">german</string>
 	<string name="MacLocale">de_DE.UTF-8</string>
+	<string name="macOSLocale">de_DE.UTF-8</string>
 	<string name="DarwinLocale">de_DE.UTF-8</string>
 	<string name="LinuxLocale">de_DE.UTF-8</string>
 	
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index e4b8f13df7..f642ca93b7 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -13,7 +13,6 @@
     chrome="true"
     height="350"
     width="304">
-  <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
   <floater.string name="text_no_emoji_for_filter" value="No emoji found for '[FILTER]'"/>
   <scroll_container
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 00411ba20b..ae907bcb5f 100644
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -75,7 +75,7 @@
         step_size="16"
         doc_pos="0"
         doc_size="3000"
-        page_size="0"
+        page_size="50"
           />
     </layout_panel>
     <layout_panel name="timers_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
index b17d0aa5b6..025d537804 100644
--- a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
+++ b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml
@@ -11,10 +11,10 @@
  name="gltf asset editor"
  title="[OBJECT_NAME]">
     <floater.string name="floater_title" value="GLTF Scene Editor"/>
-    <floater.string name="scene_tittle" value="Scene"/>
-    <floater.string name="node_tittle" value="Node"/>
-    <floater.string name="mesh_tittle" value="Mesh"/>
-    <floater.string name="skin_tittle" value="Skin"/>
+    <floater.string name="scene_title" value="Scene"/>
+    <floater.string name="node_title" value="Node"/>
+    <floater.string name="mesh_title" value="Mesh"/>
+    <floater.string name="skin_title" value="Skin"/>
 
     <layout_stack
      name="main_layout"
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 1deb81175e..2fa965b6e4 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
@@ -222,7 +222,7 @@
     height="16"
     increment="1"
     initial_value="12"
-    label="Max. # of non-impostors:"
+    label="Max. # animated avatars:"
     label_width="185"
     layout="topleft"
     left="30"
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index b0b818cde5..5ab0177de6 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -37,7 +37,8 @@
    top="16"
    left="0"
    right="-1"
-   bottom="-1">
+   bottom="-1"
+   orientation="horizontal">
     <layout_panel
      name="map_lp"
      width="385"
diff --git a/indra/newview/skins/default/xui/en/language_settings.xml b/indra/newview/skins/default/xui/en/language_settings.xml
index dd521c09d0..12a1b52a84 100644
--- a/indra/newview/skins/default/xui/en/language_settings.xml
+++ b/indra/newview/skins/default/xui/en/language_settings.xml
@@ -5,6 +5,7 @@
 	<!-- Locale Information -->
 	<string name="MicrosoftLocale">english</string>
 	<string name="MacLocale">C</string>
+	<string name="macOSLocale">C</string>
 	<string name="DarwinLocale">C</string>
 	<string name="LinuxLocale">C</string>
   
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f4864dabef..43cdf30ba0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -4248,16 +4248,6 @@ function="World.EnvPreset"
 
         <menu_item_separator/>
 
-        <menu_item_check
-         label="HTTP Textures"
-         name="HTTP Textures">
-            <menu_item_check.on_check
-             function="CheckControl"
-             parameter="ImagePipelineUseHTTP" />
-            <menu_item_check.on_click
-             function="ToggleControl"
-             parameter="ImagePipelineUseHTTP" />
-        </menu_item_check>
         <menu_item_call
          label="Compress Images"
          name="Compress Images">
diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
index d0ecd0a11c..87284f564b 100644
--- a/indra/newview/skins/default/xui/en/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml
@@ -7,7 +7,7 @@
 		none
 	</defaultwidget>
 	<defaultimpl>
-		media_plugin_webkit
+		media_plugin_cef
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
@@ -130,7 +130,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -141,7 +141,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -152,7 +152,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
@@ -163,7 +163,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -174,7 +174,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -185,7 +185,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
@@ -196,7 +196,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -207,7 +207,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
@@ -218,7 +218,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -229,7 +229,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
@@ -240,7 +240,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -251,7 +251,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
@@ -262,7 +262,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -273,7 +273,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -284,7 +284,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
@@ -295,7 +295,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -306,7 +306,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -317,7 +317,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -328,7 +328,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -339,7 +339,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
@@ -350,7 +350,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
@@ -361,7 +361,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/png">
@@ -372,7 +372,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
@@ -383,7 +383,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
@@ -394,7 +394,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/html">
@@ -405,7 +405,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
@@ -416,7 +416,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="text/xml">
@@ -427,7 +427,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
@@ -438,7 +438,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -449,7 +449,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
@@ -460,7 +460,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -471,7 +471,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -482,7 +482,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -493,7 +493,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 02e135a2c7..868d54401e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
- height="750"
+ height="770"
  label="Members &amp; Roles"
  layout="topleft"
  left="0"
@@ -18,9 +18,9 @@
     <panel.string
      name="help_text" />
     <tab_container
-    border="false"
+     border="false"
      follows="left|top|right"
-     height="552"
+     height="770"
      halign="center"
      layout="topleft"
      left="0"
@@ -29,16 +29,10 @@
      tab_position="top"
      tab_height="22"
      tab_min_width="90"
-     top="0"
-     width="304">
+     top="0">
         <panel
          border="false"
-         follows="all"
-         height="303"
          label="MEMBERS"
-         layout="topleft"
-         left="0"
-         right="-1"
          help_topic="roles_members_tab"
          name="members_sub_tab"
          tool_tip="Members"
@@ -65,16 +59,16 @@ clicking on their names.
              name="power_partial_icon" translate="false">
                 Checkbox_Off
             </panel.string>
-         <filter_editor
-         layout="topleft"
-         top="5"
-         left="5"
-         right="-5"
-         height="22"
-         search_button_visible="false"
-         follows="left|top|right"
-         label="Filter Members"
-         name="filter_input" />
+            <filter_editor
+             layout="topleft"
+             top="5"
+             left="5"
+             right="-5"
+             height="22"
+             search_button_visible="false"
+             follows="left|top|right"
+             label="Filter Members"
+             name="filter_input" />
             <name_list
              column_padding="2"
              draw_heading="true"
@@ -90,11 +84,11 @@ clicking on their names.
                 <name_list.columns
                  label="Member"
                  name="name"
-               relative_width="0.44" />
+                 relative_width="0.44" />
                 <name_list.columns
                  label="Donation"
                  name="donated"
-         		 relative_width="0.2" />
+                 relative_width="0.2" />
                 <name_list.columns
                  label="Status"
                  name="online"
@@ -118,25 +112,21 @@ clicking on their names.
              left_pad="10"
              name="member_eject"
              width="100" />
-      <button
-       height="23"
-       label="Ban Member(s)"
-       follows="top|left"
-       left_pad="10"
-       name="member_ban"
-       width="100" />
+            <button
+             height="23"
+             label="Ban Member(s)"
+             follows="top|left"
+             left_pad="10"
+             name="member_ban"
+             width="100" />
         </panel>
         <panel
          border="false"
-         height="303"
          label="ROLES"
-         layout="topleft"
-         left="0"
-         right="-1"
          help_topic="roles_roles_tab"
          name="roles_sub_tab"
          class="panel_group_roles_subtab">
-           <!-- <button
+            <!--<button
              enabled="false"
              height="20"
              label="Show All"
@@ -145,411 +135,393 @@ clicking on their names.
              right="-5"
              name="show_all_button"
              width="100" />-->
-      <panel.string
-       name="help_text">
-        Roles have a title and an allowed list of Abilities
-        that Members can perform. Members can belong to
-        one or more Roles. A group can have up to 10 Roles,
-        including the Everyone and Owner Roles.
-      </panel.string>
-      <panel.string
-       name="cant_delete_role">
-        The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can't be deleted.
-      </panel.string>
-      <panel.string
-       name="power_folder_icon" translate="false">
-        Inv_FolderClosed
-      </panel.string>
-      <panel.string
-       name="power_all_have_icon" translate="false">
-        Checkbox_On
-      </panel.string>
-      <panel.string
-       name="power_partial_icon" translate="false">
-        Checkbox_Off
-      </panel.string>
-      <filter_editor
-      layout="topleft"
-      top="5"
-      left="5"
-      right="-5"
-      height="22"
-      search_button_visible="false"
-      follows="left|top|right"
-      label="Filter Roles"
-      name="filter_input" />
-      <scroll_list
-       column_padding="0"
-       draw_heading="true"
-       draw_stripes="false"
-       heading_height="23"
-       height="132"
-       layout="topleft"
-       search_column="1"
-       left="0"
-       follows="left|top|right"
-       right="-1"
-       name="role_list"
-       top_pad="2"
-       width="310">
-        <scroll_list.columns
-         label="Role"
-         name="name"
-       relative_width="0.45"  />
-        <scroll_list.columns
-         label="Title"
-         name="title"
-       relative_width="0.45"  />
-        <scroll_list.columns
-         label="#"
-         name="members"
-       relative_width="0.15"  />
-      </scroll_list>
-      <button
-      follows="top|left"
-       height="23"
-       label="New Role"
-       layout="topleft"
-       left="0"
-       name="role_create"
-       width="100" />
-      <button
-       follows="top|left"
-       height="23"
-       label="Copy Role"
-       layout="topleft"
-       left_pad="10"
-       name="role_copy"
-       width="100" />
-      <button
-       height="23"
-       follows="top|left"
-       label="Delete Role"
-       layout="topleft"
-       left_pad="10"
-       name="role_delete"
-       width="100" />
-    </panel>
+            <panel.string
+             name="help_text">
+                Roles have a title and an allowed list of Abilities
+that Members can perform. Members can belong to
+one or more Roles. A group can have up to 10 Roles,
+including the Everyone and Owner Roles.
+            </panel.string>
+            <panel.string
+             name="cant_delete_role">
+                The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can't be deleted.
+            </panel.string>
+            <panel.string
+             name="power_folder_icon" translate="false">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon" translate="false">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon" translate="false">
+                Checkbox_Off
+            </panel.string>
+            <filter_editor
+             layout="topleft"
+             top="5"
+             left="5"
+             right="-5"
+             height="22"
+             search_button_visible="false"
+             follows="left|top|right"
+             label="Filter Roles"
+             name="filter_input" />
+            <scroll_list
+             column_padding="0"
+             draw_heading="true"
+             draw_stripes="false"
+             heading_height="23"
+             height="138"
+             layout="topleft"
+             search_column="1"
+             left="0"
+             follows="left|top|right"
+             right="-1"
+             name="role_list"
+             top_pad="2">
+                <scroll_list.columns
+                 label="Role"
+                 name="name"
+                 relative_width="0.45" />
+                <scroll_list.columns
+                 label="Title"
+                 name="title"
+                 relative_width="0.45" />
+                <scroll_list.columns
+                 label="#"
+                 name="members"
+                 relative_width="0.15" />
+            </scroll_list>
+            <button
+             follows="top|left"
+             height="23"
+             label="New Role"
+             layout="topleft"
+             left="0"
+             name="role_create"
+             width="100" />
+            <button
+             follows="top|left"
+             height="23"
+             label="Copy Role"
+             layout="topleft"
+             left_pad="10"
+             name="role_copy"
+             width="100" />
+            <button
+             height="23"
+             follows="top|left"
+             label="Delete Role"
+             layout="topleft"
+             left_pad="10"
+             name="role_delete"
+             width="100" />
+        </panel>
+        <panel
+         border="false"
+         label="ABILITIES"
+         help_topic="roles_actions_tab"
+         name="actions_sub_tab"
+         class="panel_group_actions_subtab"
+         tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability.">
+            <panel.string
+             name="help_text">
+                Abilities allow Members in Roles to do specific
+things in this group. There&apos;s a broad variety of Abilities.
+            </panel.string>
+            <panel.string
+             name="power_folder_icon" translate="false">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon" translate="false">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon" translate="false">
+                Checkbox_Off
+            </panel.string>
+            <filter_editor
+             layout="topleft"
+             top="5"
+             left="5"
+             right="-5"
+             height="22"
+             search_button_visible="false"
+             follows="left|top|right"
+             label="Filter Abilities"
+             name="filter_input" />
+            <scroll_list
+             column_padding="0"
+             draw_stripes="true"
+             height="200"
+             follows="left|top|right"
+             layout="topleft"
+             left="0"
+             right="-1"
+             name="action_list"
+             search_column="2"
+             tool_tip="Select an Ability to view more details"
+             top_pad="5">
+                <scroll_list.columns
+                 label=""
+                 name="icon"
+                 width="2" />
+                <scroll_list.columns
+                 label=""
+                 name="checkbox"
+                 width="20" />
+                <scroll_list.columns
+                 label=""
+                 name="action" />
+            </scroll_list>
+        </panel>
+        <panel
+         border="false"
+         label="BANNED RESIDENTS"
+         help_topic="roles_banlist_tab"
+         name="banlist_sub_tab"
+         class="panel_group_banlist_subtab"
+         tool_tip="View the banned residents from this group.">
+            <panel.string
+             name="help_text">
+                Any resident on the ban list will be unable to join the group.
+            </panel.string>
+            <panel.string
+             name="ban_count_template">
+                Ban count: [COUNT]/[LIMIT]
+            </panel.string>
+            <name_list
+             column_padding="0"
+             draw_heading="true"
+             height="714"
+             follows="left|top|right"
+             layout="topleft"
+             left="0"
+             right="-1"
+             multi_select="true"
+             name="ban_list"
+             short_names="false"
+             top_pad="5">
+                <name_list.columns
+                 label="Resident"
+                 name="name"
+                 font.name="SANSSERIF_SMALL"
+                 font.style="NORMAL"
+                 relative_width="0.7" />
+                <name_list.columns
+                 label="Date Banned"
+                 name="ban_date"
+                 relative_width="0.3" />
+            </name_list>
+            <button
+             follows="top|left"
+             height="23"
+             label="Ban Resident(s)"
+             layout="topleft"
+             left="3"
+             name="ban_create"
+             tool_tip="Ban residents from your group"
+             width="120" />
+            <button
+             follows="top|left"
+             height="23"
+             label="Remove Ban(s)"
+             layout="topleft"
+             left_pad="5"
+             name="ban_delete"
+             tool_tip="Unban selected residents from your group"
+             width="120" />
+            <button
+             follows="top|left"
+             height="23"
+             width="23"
+             image_overlay="Refresh_Off"
+             layout="topleft"
+             left_pad="5"
+             name="ban_refresh"
+             tool_tip="Refresh the ban list" />
+            <text
+             type="string"
+             height="18"
+             left_pad="5"
+             follows="top|left"
+             layout="topleft"
+             name="ban_count"
+             width="100">
+            </text>
+        </panel>
+    </tab_container>
     <panel
-     border="false"
-     height="303"
-     label="ABILITIES"
+     height="350"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
+     follows="top|left|right"
      left="0"
      right="-1"
-     help_topic="roles_actions_tab"
-     name="actions_sub_tab"
-     class="panel_group_actions_subtab"
-     tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability."
-     width="310">
-      <panel.string
-       name="help_text">
-        Abilities allow Members in Roles to do specific
-        things in this group. There&apos;s a broad variety of Abilities.
-      </panel.string>
-      <panel.string
-       name="power_folder_icon" translate="false">
-        Inv_FolderClosed
-      </panel.string>
-      <panel.string
-       name="power_all_have_icon" translate="false">
-        Checkbox_On
-      </panel.string>
-      <panel.string
-       name="power_partial_icon" translate="false">
-        Checkbox_Off
-      </panel.string>
-      <filter_editor
-      layout="topleft"
-      top="5"
-      left="5"
-      right="-5"
-      height="22"
-      search_button_visible="false"
-      follows="left|top|right"
-      label="Filter Abilities"
-      name="filter_input" />
-      <scroll_list
-       column_padding="0"
-       draw_stripes="true"
-       height="200"
-       follows="left|top|right"
-       layout="topleft"
-       left="0"
-       right="-1"
-       name="action_list"
-       search_column="2"
-       tool_tip="Select an Ability to view more details"
-       top_pad="5"
-       width="300">
-        <scroll_list.columns
-         label=""
-         name="icon"
-         width="2" />
-        <scroll_list.columns
-         label=""
-         name="checkbox"
-         width="20" />
-        <scroll_list.columns
-         label=""
-         name="action" />
-      </scroll_list>
+     mouse_opaque="false"
+     name="members_footer"
+     top="325"
+     visible="false">
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top="8"
+         text_color="EmphasisColor"
+         name="static"
+         width="300">
+            Assigned Roles
+        </text>
+        <scroll_list
+         draw_stripes="true"
+         follows="left|top|right"
+         height="150"
+         layout="topleft"
+         left="0"
+         right="-1"
+         name="member_assigned_roles"
+         top_pad="0">
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="role"
+             width="270" />
+        </scroll_list>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top_pad="5"
+         text_color="EmphasisColor"
+         name="static2"
+         width="285">
+            Allowed Abilities
+        </text>
+        <scroll_list
+         draw_stripes="true"
+         follows="left|top|right"
+         height="150"
+         layout="topleft"
+         left="0"
+         right="-1"
+         name="member_allowed_actions"
+         search_column="2"
+         tool_tip="For details of each allowed ability see the abilities tab"
+         top_pad="0">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="action"
+             width="270" />
+        </scroll_list>
     </panel>
     <panel
-     border="false"
-     height="303"
-     label="BANNED RESIDENTS"
+     height="90"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
+     follows="top|left|right"
      left="0"
      right="-1"
-     help_topic="roles_banlist_tab"
-     name="banlist_sub_tab"
-     class="panel_group_banlist_subtab"
-     tool_tip="View the banned residents from this group."
-     width="310">
-      <panel.string
-       name="help_text">
-        Any resident on the ban list will be unable to join the group.
-      </panel.string>
-      <panel.string
-       name="ban_count_template">
-        Ban count: [COUNT]/[LIMIT]
-      </panel.string>
-      <name_list
-           column_padding="0"
-           draw_heading="true"
-           height="400"
-           follows="left|top|right"
-           layout="topleft"
-           left="0"
-           right="-1"
-           multi_select="true"
-           name="ban_list"
-           short_names="false"
-           top_pad="5">
-        <name_list.columns
-         label="Resident"
-         name="name"
-         font.name="SANSSERIF_SMALL"
-         font.style="NORMAL"
-         relative_width="0.7" />
-        <name_list.columns
-         label="Date Banned"
-         name="ban_date"
-         relative_width="0.3" />
-      </name_list>
-      <button
-        follows="top|left"
-        height="23"
-        label="Ban Resident(s)"
-        layout="topleft"
-        left="3"
-        name="ban_create"
-        tool_tip="Ban residents from your group"
-        width="120" />
-      <button
-        follows="top|left"
-        height="23"
-        label="Remove Ban(s)"
-        layout="topleft"
-        left_pad="5"
-        name="ban_delete"
-        tool_tip="Unban selected residents from your group"
-        width="120" />
-      <button
-        follows="top|left"
-        height="23"
-        width="23"
-        image_overlay="Refresh_Off"
-        layout="topleft"
-        left_pad="5"
-        name="ban_refresh"
-        tool_tip="Refresh the ban list"
-        />
-      <text
-        type="string"
-        height="18"
-        left_pad="5"
-        follows="top|left"
-        layout="topleft"
-        name="ban_count"
-        width="100">
-      </text>
+     mouse_opaque="false"
+     name="members_header"
+     top_pad="3"
+     visible="false">
+        <text_editor
+         bg_readonly_color="Transparent"
+         text_readonly_color="EmphasisColor"
+         font="SansSerifSmall"
+         type="string"
+         enabled="false"
+         halign="left"
+         layout="topleft"
+         top_pad="0"
+         follows="left|top|right"
+         left="0"
+         right="-1"
+         height="90"
+         max_length="512"
+         name="member_action_description"
+         word_wrap="true">
+            This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+        </text_editor>
     </panel>
-  </tab_container>
-  <panel
-   height="350"
-   background_visible="false"
-   bg_alpha_color="FloaterUnfocusBorderColor"
-   layout="topleft"
-   follows="top|left|right"
-   left="0"
-   right="-1"
-   width="313"
-   mouse_opaque="false"
-   name="members_footer"
-   top="325"
-   visible="false">
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     top="8"
-     text_color="EmphasisColor"
-     name="static"
-     width="300">
-      Assigned Roles
-    </text>
-    <scroll_list
-     draw_stripes="true"
-    follows="left|top|right"
-     height="150"
+    <panel
+     height="460"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
+     follows="top|left|right"
      left="0"
      right="-1"
-     name="member_assigned_roles"
-     top_pad="0">
-      <scroll_list.columns
-       label=""
-       name="checkbox"
-       width="20" />
-      <scroll_list.columns
-       label=""
-       name="role"
-       width="270" />
-    </scroll_list>
-    <text
-   type="string"
-   height="16"
-   layout="topleft"
-   follows="left|top"
-   left="5"
-   top_pad="5"
-   text_color="EmphasisColor"
-   name="static2"
-   width="285">
-      Allowed Abilities
-    </text>
-    <scroll_list
-     draw_stripes="true"
+     mouse_opaque="false"
+     name="roles_footer"
+     top_delta="0"
+     top="215"
+     visible="false">
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top="5"
+         name="static"
+         width="300">
+            Role Name
+        </text>
+        <line_editor
+         type="string"
+         height="20"
+         layout="topleft"
+         left="0"
          follows="left|top|right"
-     height="150"
-     layout="topleft"
-     left="0"
-     right="-1"
-     name="member_allowed_actions"
-     search_column="2"
-     tool_tip="For details of each allowed ability see the abilities tab"
-     top_pad="0">
-      <scroll_list.columns
-       label=""
-       name="icon"
-       width="2" />
-      <scroll_list.columns
-       label=""
-       name="checkbox"
-       width="20" />
-      <scroll_list.columns
-       label=""
-       name="action"
-       width="270" />
-    </scroll_list>
-  </panel>
-  <panel
-   height="90"
-   background_visible="false"
-   bg_alpha_color="FloaterUnfocusBorderColor"
-   layout="topleft"
-   follows="top|left|right"
-   left="0"
-   right="-1"
-   width="313"
-   mouse_opaque="false"
-   name="members_header"
-   top_pad="3"
-   visible="false">
-    <text_editor
-     bg_readonly_color="Transparent"
-     text_readonly_color="EmphasisColor"
-     font="SansSerifSmall"
-     type="string"
-     enabled="false"
-     halign="left"
-     layout="topleft"
-     top_pad="0"
-     follows="left|top|right"
-     left="0"
-     right="-1"
-     height="90"
-     max_length="512"
-     name="member_action_description"
-     word_wrap="true">
-      This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
-   </text_editor>
-  </panel>
-  <panel
-   height="460"
-   background_visible="false"
-   bg_alpha_color="FloaterUnfocusBorderColor"
-   layout="topleft"
-   follows="top|left|right"
-   left="0"
-   right="-1"
-   width="313"
-   mouse_opaque="false"
-   name="roles_footer"
-   top_delta="0"
-   top="209"
-   visible="false">
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     top="5"
-     name="static"
-     width="300">
-      Role Name
-    </text>
-    <line_editor
-     type="string"
-     height="20"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     max_length_bytes="20"
-     name="role_name"
-     top_pad="0"
-     width="300">
-    </line_editor>
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     name="static3"
-     top_pad="5"
-     width="300">
-      Role Title
-    </text>
-    <line_editor
-     type="string"
-     height="20"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     max_length_bytes="20"
-     name="role_title"
-     top_pad="0"
-     width="300">
-    </line_editor>
-    <text
+         right="-1"
+         max_length_bytes="20"
+         name="role_name"
+         top_pad="0">
+        </line_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static3"
+         top_pad="5"
+         width="300">
+            Role Title
+        </text>
+        <line_editor
+         type="string"
+         height="20"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         max_length_bytes="20"
+         name="role_title"
+         top_pad="0">
+        </line_editor>
+        <text
          type="string"
          height="16"
          layout="topleft"
@@ -558,192 +530,185 @@ clicking on their names.
          name="static2"
          top_pad="5"
          width="200">
-      Description
-    </text>
-    <text_editor
-     type="string"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     max_length="295"
-     height="35"
-     name="role_description"
-     top_pad="0"
-     width="300"
-     word_wrap="true">
-    </text_editor>
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     text_color="EmphasisColor"
-     name="static4"
-     top_pad="5"
-     width="300">
-      Assigned Members
-    </text>
-    <name_list
-     draw_stripes="true"
-     height="128"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     name="role_assigned_members"
-     top_pad="0"
-     width="300" />
-    <check_box
-     height="15"
-     label="Reveal members"
-     left="5"
-     layout="topleft"
-     name="role_visible_in_list"
-     tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
-     top_pad="4"
-     width="300" />
-    <text
-    type="string"
-    height="16"
-    layout="topleft"
-    follows="left|top"
-    left="5"
-    text_color="EmphasisColor"
-    name="static5"
-    top_pad="2"
-    width="300">
-      Allowed Abilities
-    </text>
-    <scroll_list
-     draw_stripes="true"
-     height="140"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     name="role_allowed_actions"
-     search_column="2"
-     tool_tip="For details of each allowed ability see the abilities tab"
-     top_pad="0"
-     width="300">
-      <scroll_list.columns
-       label=""
-       name="icon"
-       width="2" />
-      <scroll_list.columns
-       label=""
-       name="checkbox"
-       width="20" />
-      <scroll_list.columns
-       label=""
-       name="action" />
-    </scroll_list>
-  </panel>
-  <panel
-   height="90"
-   background_visible="false"
-   bg_alpha_color="FloaterUnfocusBorderColor"
-   layout="topleft"
-   follows="top|left|right"
-   left="0"
-   right="-1"
-   width="313"
-   mouse_opaque="false"
-   name="roles_header"
-   top_pad="3"
-   visible="false">
-    <text_editor
-     bg_readonly_color="Transparent"
-     text_readonly_color="EmphasisColor"
-     font="SansSerifSmall"
-     type="string"
-     enabled="false"
-     halign="left"
-     layout="topleft"
-     top_pad="0"
-     follows="left|top|right"
-     left="0"
-     right="-1"
+            Description
+        </text>
+        <text_editor
+         type="string"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         max_length="295"
+         height="35"
+         name="role_description"
+         top_pad="0"
+         word_wrap="true">
+        </text_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         text_color="EmphasisColor"
+         name="static4"
+         top_pad="5"
+         width="300">
+            Assigned Members
+        </text>
+        <name_list
+         draw_stripes="true"
+         height="128"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         name="role_assigned_members"
+         top_pad="0" />
+        <check_box
+         height="15"
+         label="Reveal members"
+         left="5"
+         layout="topleft"
+         name="role_visible_in_list"
+         tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
+         top_pad="4"
+         width="300" />
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         text_color="EmphasisColor"
+         name="static5"
+         top_pad="2"
+         width="300">
+            Allowed Abilities
+        </text>
+        <scroll_list
+         draw_stripes="true"
+         height="140"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         name="role_allowed_actions"
+         search_column="2"
+         tool_tip="For details of each allowed ability see the abilities tab"
+         top_pad="0">
+          <scroll_list.columns
+           label=""
+           name="icon"
+           width="2" />
+          <scroll_list.columns
+           label=""
+           name="checkbox"
+           width="20" />
+          <scroll_list.columns
+           label=""
+           name="action" />
+        </scroll_list>
+    </panel>
+    <panel
      height="90"
-     max_length="512"
-     name="role_action_description"
-     word_wrap="true">
-      This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
-    </text_editor>
-  </panel>
-  <panel
-    height="424"
-    background_visible="false"
-    bg_alpha_color="FloaterUnfocusBorderColor"
-    layout="topleft"
-    follows="top|left|right"
-    left="0"
-    right="-1"
-    width="313"
-    mouse_opaque="false"
-    name="actions_footer"
-    top_delta="0"
-    top="255"
-    visible="false">
-    <text_editor
-   bg_readonly_color="Transparent"
-   text_readonly_color="EmphasisColor"
-   font="SansSerifSmall"
-     type="string"
-     enabled="false"
-     halign="left"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
-     follows="left|top|right"
+     follows="top|left|right"
      left="0"
      right="-1"
-     height="90"
-     max_length="512"
-     name="action_description"
-     top="0"
-     word_wrap="true">
-      This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
-    </text_editor>
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     name="static2"
-     top_pad="1"
-     width="300">
-      Roles with this ability
-    </text>
-    <scroll_list
-     height="172"
-     layout="topleft"
-     follows="left|top|right"
-     left="5"
-     right="-1"
-     name="action_roles"
-     top_pad="0"
-     width="300" />
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     name="static3"
-     top_pad="5"
-     width="300">
-      Members with this ability
-    </text>
-    <name_list
-     height="122"
-     follows="left|top|right"
+     mouse_opaque="false"
+     name="roles_header"
+     top_pad="3"
+     visible="false">
+        <text_editor
+         bg_readonly_color="Transparent"
+         text_readonly_color="EmphasisColor"
+         font="SansSerifSmall"
+         type="string"
+         enabled="false"
+         halign="left"
+         layout="topleft"
+         top_pad="0"
+         follows="left|top|right"
+         left="0"
+         right="-1"
+         height="90"
+         max_length="512"
+         name="role_action_description"
+         word_wrap="true">
+            This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+        </text_editor>
+    </panel>
+    <panel
+     height="513"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
-     left="5"
+     follows="top|left|right"
+     left="0"
      right="-1"
-     name="action_members"
-     top_pad="0"
-     width="300" />
-  </panel>
+     mouse_opaque="false"
+     name="actions_footer"
+     top_delta="0"
+     top="255"
+     visible="false">
+        <text_editor
+         bg_readonly_color="Transparent"
+         text_readonly_color="EmphasisColor"
+         font="SansSerifSmall"
+         type="string"
+         enabled="false"
+         halign="left"
+         layout="topleft"
+         follows="left|top|right"
+         left="0"
+         right="-1"
+         height="90"
+         max_length="512"
+         name="action_description"
+         top="0"
+         word_wrap="true">
+            This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+        </text_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static2"
+         top_pad="1"
+         width="300">
+            Roles with this ability
+        </text>
+        <scroll_list
+         height="216"
+         layout="topleft"
+         follows="left|top|right"
+         left="5"
+         right="-1"
+         name="action_roles"
+         top_pad="0" />
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static3"
+         top_pad="5"
+         width="300">
+            Members with this ability
+        </text>
+        <name_list
+         height="167"
+         follows="left|top|right"
+         layout="topleft"
+         left="5"
+         right="-1"
+         name="action_members"
+         top_pad="0" />
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index c906e2f96c..d6ac71db94 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -179,7 +179,6 @@
             control_name="RememberPassword"
             follows="left|top"
             font="SansSerifLarge"
-            text_color="EmphasisColor"
             height="24"
             left="262"
             bottom_delta="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 5d347397bf..cb3e0e4b6a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -210,26 +210,60 @@
     increment="8"
     initial_value="160"
     label="Draw distance:"
-    label_width="90"
+    label_width="187"
     layout="topleft"
     left="30"
     min_val="64"
     max_val="512"
     name="DrawDistance"
     top_delta="40"
-    width="330" />
+    width="427" />
   <text
     type="string"
     length="1"
     follows="left|top"
     height="12"
     layout="topleft"
-    left_delta="330"
+    left_delta="427"
     name="DrawDistanceMeterText2"
     top_delta="0"
     width="128">
      m
   </text>
+  <slider
+    control_name="IndirectMaxNonImpostors"
+    name="IndirectMaxNonImpostors"
+    decimal_digits="0"
+    increment="1"
+    initial_value="12"
+    show_text="false"
+    min_val="1"
+    max_val="66"
+    label="Maximum number of animated avatars:"
+    follows="left|top"
+    layout="topleft"
+    height="16"
+    label_width="240"
+    left="30"
+    top_delta="40"
+    width="393">
+      <slider.commit_callback
+        function="Pref.UpdateIndirectMaxNonImpostors"
+        parameter="IndirectNonImpostorsText" />
+  </slider>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    top_delta="0"
+    left_delta="397"
+    text_readonly_color="LabelDisabledColor"
+    name="IndirectMaxNonImpostorsText"
+    width="65">
+      0
+  </text>
 
   <button
   height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index 024120931f..4f441b9b49 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -200,6 +200,26 @@
 
         <layout_panel
          follows="all"
+         layout="bottomleft"
+         left_pad="2"
+         name="set_to_curr_location_btn_lp"
+         auto_resize="false"
+         width="100">
+          <button
+           name="set_to_curr_location_btn"
+           label="Set Location"
+           tool_tip="Set to Current Location"
+           left="0"
+           top="0"
+           height="23"
+           width="100"
+           follows="left|top"
+           layout="topleft"
+          />
+        </layout_panel>
+
+        <layout_panel
+         follows="all"
          layout="topleft"
          name="util_resizer_right"
          auto_resize="true"
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 6d23592948..6531233696 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -264,8 +264,7 @@
                                 top_pad="1"
                                 halign="right"
                                 name="txt_alt1">
-                            Sky [INDEX]
-                            [ALTITUDE]m
+                            Sky [INDEX]&#xA;[ALTITUDE]m
                         </text>
                         <line_editor
                                 follows="left|top"
@@ -310,8 +309,7 @@
                                 top_pad="1"
                                 halign="right"
                                 name="txt_alt2">
-                            Sky [INDEX]
-                            [ALTITUDE]m
+                            Sky [INDEX]&#xA;[ALTITUDE]m
                         </text>
                         <line_editor
                                 follows="left|top"
@@ -356,8 +354,7 @@
                                 top_pad="1"
                                 halign="right"
                                 name="txt_alt3">
-                            Sky [INDEX]
-                            [ALTITUDE]m
+                            Sky [INDEX]&#xA;[ALTITUDE]m
                         </text>
                         <line_editor
                                 follows="left|top"
diff --git a/indra/newview/skins/default/xui/es/language_settings.xml b/indra/newview/skins/default/xui/es/language_settings.xml
index 997293a741..7a52f7cdae 100644
--- a/indra/newview/skins/default/xui/es/language_settings.xml
+++ b/indra/newview/skins/default/xui/es/language_settings.xml
@@ -5,6 +5,7 @@
 	<!-- Locale Information -->
 	<string name="MicrosoftLocale">spanish</string>
 	<string name="MacLocale">es_ES.UTF-8</string>
+	<string name="macOSLocale">es_ES.UTF-8</string>
 	<string name="DarwinLocale">es_ES.UTF-8</string>
 	<string name="LinuxLocale">es_ES.UTF-8</string>
 	
diff --git a/indra/newview/skins/default/xui/fr/language_settings.xml b/indra/newview/skins/default/xui/fr/language_settings.xml
index fdac9d65a7..fdb119ec69 100644
--- a/indra/newview/skins/default/xui/fr/language_settings.xml
+++ b/indra/newview/skins/default/xui/fr/language_settings.xml
@@ -5,6 +5,7 @@
 	<!-- Locale Information -->
 	<string name="MicrosoftLocale">french</string>
 	<string name="MacLocale">fr_FR.UTF-8</string>
+	<string name="macOSLocale">fr_FR.UTF-8</string>
 	<string name="DarwinLocale">fr_FR.UTF-8</string>
 	<string name="LinuxLocale">fr_FR.UTF-8</string>
 	
diff --git a/indra/newview/skins/default/xui/it/language_settings.xml b/indra/newview/skins/default/xui/it/language_settings.xml
index 5f448fa828..7eb1b560bd 100644
--- a/indra/newview/skins/default/xui/it/language_settings.xml
+++ b/indra/newview/skins/default/xui/it/language_settings.xml
@@ -5,6 +5,7 @@
 	<!-- Locale Information -->
 	<string name="MicrosoftLocale">italian</string>
 	<string name="MacLocale">it_IT.UTF-8</string>
+	<string name="macOSLocale">it_IT.UTF-8</string>
 	<string name="DarwinLocale">it_IT.UTF-8</string>
 	<string name="LinuxLocale">it_IT.UTF-8</string>
 	
diff --git a/indra/newview/skins/default/xui/ja/language_settings.xml b/indra/newview/skins/default/xui/ja/language_settings.xml
index facae22acf..c94a16cee0 100644
--- a/indra/newview/skins/default/xui/ja/language_settings.xml
+++ b/indra/newview/skins/default/xui/ja/language_settings.xml
@@ -6,6 +6,9 @@
 	<string name="MacLocale">
 		ja_JP.UTF-8
 	</string>
+	<string name="macOSLocale">
+		ja_JP.UTF-8
+	</string>
 	<string name="DarwinLocale">
 		ja_JP.UTF-8
 	</string>
diff --git a/indra/newview/skins/default/xui/pl/language_settings.xml b/indra/newview/skins/default/xui/pl/language_settings.xml
index 0057ca530c..9993062487 100644
--- a/indra/newview/skins/default/xui/pl/language_settings.xml
+++ b/indra/newview/skins/default/xui/pl/language_settings.xml
@@ -2,6 +2,7 @@
 <strings>
 	<string name="MicrosoftLocale">polish</string>
 	<string name="MacLocale">pl_PL.UTF-8</string>
+	<string name="macOSLocale">pl_PL.UTF-8</string>
 	<string name="DarwinLocale">pl_PL.UTF-8</string>
 	<string name="LinuxLocale">pl_PL.UTF-8</string>
 	<string name="TimeHour">hour,datetime,slt</string>
diff --git a/indra/newview/skins/default/xui/pt/language_settings.xml b/indra/newview/skins/default/xui/pt/language_settings.xml
index 8799475ace..d5be208eb3 100644
--- a/indra/newview/skins/default/xui/pt/language_settings.xml
+++ b/indra/newview/skins/default/xui/pt/language_settings.xml
@@ -5,6 +5,7 @@
 	<!-- Locale Information -->
 	<string name="MicrosoftLocale">portuguese</string>
 	<string name="MacLocale">pt_PT.UTF-8</string>
+	<string name="macOSLocale">pt_PT.UTF-8</string>
 	<string name="DarwinLocale">pt_PT.UTF-8</string>
 	<string name="LinuxLocale">pt_PT.UTF-8</string>