Merge pull request #4714 from secondlife/release/2025.07

Release/2025.07

21 files changed, 536 insertions, 250 deletions

diff --git a/indra/newview/skins/default/xui/da/floater_search.xml b/indra/newview/skins/default/xui/da/floater_search.xml
deleted file mode 100644
index 80a30b1aa1..0000000000
--- a/indra/newview/skins/default/xui/da/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="FIND">
-	<floater.string name="loading_text">
-		Henter...
-	</floater.string>
-	<floater.string name="done_text">
-		Færdig
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Gentag søgning med &quot;God level&quot;
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_search.xml b/indra/newview/skins/default/xui/de/floater_search.xml
deleted file mode 100644
index bd39bf2bce..0000000000
--- a/indra/newview/skins/default/xui/de/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		Wird geladen...
-	</floater.string>
-	<floater.string name="done_text">
-		Fertig
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Suche wiederholen, um aktuellen Gott-Level zu berücksichtigen
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_marketplace.xml b/indra/newview/skins/default/xui/en/floater_marketplace.xml
new file mode 100644
index 0000000000..99fb3a1ad8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_marketplace.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+  legacy_header_height="18"
+  can_minimize="true"
+  can_close="true"
+  can_resize="true"
+  height="775"
+  layout="topleft"
+  min_height="500"
+  min_width="600"
+  name="Marketplace"
+  save_rect="true"
+  single_instance="true"
+  save_visibility="true"
+  title="MARKETPLACE"
+  tab_stop="true"
+  width="780">
+  <layout_stack
+    bottom="775"
+    follows="left|right|top|bottom"
+    layout="topleft"
+    left="5"
+    animate="false"
+    name="stack1"
+    orientation="vertical"
+    top="20"
+    width="770">
+    <layout_panel
+      auto_resize="false"
+      default_tab_group="1"
+      height="22"
+      layout="topleft"
+      left="0"
+      min_height="20"
+      name="nav_controls"
+      top="400"
+      width="770">
+      <button
+        image_overlay="Arrow_Left_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        chrome="true"
+        hover_glow_amount="0.15"
+        tool_tip="Navigate back"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="1"
+        name="back"
+        top="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Back" />
+      </button>
+      <button
+        image_overlay="Arrow_Right_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Navigate forward"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="27"
+        name="forward"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Forward" />
+      </button>
+      <button
+        image_overlay="Stop_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Stop navigation"
+        enabled="true"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="stop"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Stop" />
+      </button>
+      <button
+        image_overlay="Refresh_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Reload page"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="reload"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Reload" />
+      </button>
+      <combo_box
+        allow_text_entry="true"
+        follows="left|top|right"
+        tab_group="1"
+        height="22"
+        layout="topleft"
+        left_pad="4"
+        max_chars="1024"
+        name="address"
+        combo_editor.select_on_focus="true"
+        tool_tip="Enter URL here"
+        top_delta="0"
+        width="672">
+        <combo_box.commit_callback
+          function="WebContent.EnterAddress" />
+      </combo_box>
+      <icon
+        name="media_secure_lock_flag"
+        height="16"
+        follows="top|left"
+        image_name="Lock2"
+        layout="topleft"
+        left_delta="2"
+        top_delta="2"
+        visible="false" 
+        tool_tip="Secured Browsing"
+        width="16" />
+      <button
+        image_overlay="ExternalBrowser_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Open current URL in your desktop browser"
+        follows="right|top"
+        enabled="true" 
+        height="22"
+        layout="topleft"
+        name="popexternal"
+        right="770"
+        top_delta="-2"
+        width="22">
+        <button.commit_callback
+          function="WebContent.PopExternal" />
+      </button>
+    </layout_panel>
+    <layout_panel
+      height="40"
+      layout="topleft"
+      left_delta="0"
+      name="external_controls"
+      top_delta="0"
+      auto_resize="true"
+      width="585">
+      <web_browser
+        bottom="-2"
+        follows="all"
+        layout="topleft"
+        left="0"
+        name="marketplace_contents"
+        top="0"/>
+    </layout_panel>
+    <layout_panel name="status_bar" 
+     height="23"
+     auto_resize="false">
+      <text
+        type="string"
+        length="200"
+        follows="bottom|left"
+        height="20"
+        layout="topleft"
+        left_delta="0"
+        name="statusbartext"
+        parse_urls="false"
+        text_color="0.4 0.4 0.4 1"
+        top_pad="3"
+        width="495"/>
+      <progress_bar
+        color_bar="0.3 1.0 0.3 1"
+        follows="bottom|right"
+        height="16"
+        top_delta="-1"
+        left_pad="24"
+        layout="topleft"
+        name="statusbarprogress"
+        width="64"/>
+    </layout_panel>
+  </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index fc1e32915a..43c4aa1b9d 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -1,18 +1,202 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater
-  positioning="cascading"
   legacy_header_height="18"
+  can_minimize="true"
+  can_close="true"
   can_resize="true"
   height="775"
   layout="topleft"
-  min_height="400"
-  min_width="500"
-  name="floater_search"
-  help_topic="floater_search"
+  min_height="500"
+  min_width="600"
+  name="Search"
   save_rect="true"
+  single_instance="true"
   save_visibility="true"
-  title=""
-  initial_mime_type="text/html"
-  width="780"
+  title="SEARCH"
   tab_stop="true"
-  filename="floater_web_content.xml"/>
+  width="780">
+  <layout_stack
+    bottom="775"
+    follows="left|right|top|bottom"
+    layout="topleft"
+    left="5"
+    animate="false"
+    name="stack1"
+    orientation="vertical"
+    top="20"
+    width="770">
+    <layout_panel
+      auto_resize="false"
+      default_tab_group="1"
+      height="22"
+      layout="topleft"
+      left="0"
+      min_height="20"
+      name="nav_controls"
+      top="400"
+      width="770">
+      <button
+        image_overlay="Arrow_Left_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        chrome="true"
+        hover_glow_amount="0.15"
+        tool_tip="Navigate back"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="1"
+        name="back"
+        top="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Back" />
+      </button>
+      <button
+        image_overlay="Arrow_Right_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Navigate forward"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="27"
+        name="forward"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Forward" />
+      </button>
+      <button
+        image_overlay="Stop_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Stop navigation"
+        enabled="true"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="stop"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Stop" />
+      </button>
+      <button
+        image_overlay="Refresh_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Reload page"
+        follows="left|top"
+        height="22"
+        layout="topleft"
+        left="51"
+        name="reload"
+        top_delta="0"
+        width="22">
+        <button.commit_callback
+          function="WebContent.Reload" />
+      </button>
+      <combo_box
+        allow_text_entry="true"
+        follows="left|top|right"
+        tab_group="1"
+        height="22"
+        layout="topleft"
+        left_pad="4"
+        max_chars="1024"
+        name="address"
+        combo_editor.select_on_focus="true"
+        tool_tip="Enter URL here"
+        top_delta="0"
+        width="672">
+        <combo_box.commit_callback
+          function="WebContent.EnterAddress" />
+      </combo_box>
+      <icon
+        name="media_secure_lock_flag"
+        height="16"
+        follows="top|left"
+        image_name="Lock2"
+        layout="topleft"
+        left_delta="2"
+        top_delta="2"
+        visible="false" 
+        tool_tip="Secured Browsing"
+        width="16" />
+      <button
+        image_overlay="ExternalBrowser_Off"
+        image_disabled="PushButton_Disabled"
+        image_disabled_selected="PushButton_Disabled"
+        image_selected="PushButton_Selected"
+        image_unselected="PushButton_Off"
+        chrome="true"
+        tool_tip="Open current URL in your desktop browser"
+        follows="right|top"
+        enabled="true" 
+        height="22"
+        layout="topleft"
+        name="popexternal"
+        right="770"
+        top_delta="-2"
+        width="22">
+        <button.commit_callback
+          function="WebContent.PopExternal" />
+      </button>
+    </layout_panel>
+    <layout_panel
+      height="40"
+      layout="topleft"
+      left_delta="0"
+      name="external_controls"
+      top_delta="0"
+      auto_resize="true"
+      width="585">
+      <web_browser
+        bottom="-2"
+        follows="all"
+        layout="topleft"
+        left="0"
+        trusted_content="true"
+        name="search_contents"
+        top="0"/>
+    </layout_panel>
+    <layout_panel name="status_bar" 
+     height="23"
+     auto_resize="false">
+      <text
+        type="string"
+        length="200"
+        follows="bottom|left"
+        height="20"
+        layout="topleft"
+        left_delta="0"
+        name="statusbartext"
+        parse_urls="false"
+        text_color="0.4 0.4 0.4 1"
+        top_pad="3"
+        width="495"/>
+      <progress_bar
+        color_bar="0.3 1.0 0.3 1"
+        follows="bottom|right"
+        height="16"
+        top_delta="-1"
+        left_pad="24"
+        layout="topleft"
+        name="statusbarprogress"
+        width="64"/>
+    </layout_panel>
+  </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
index a93be6a18d..c40ae3ea06 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
@@ -66,6 +66,7 @@
    visible="false"
    name="comment_text"
    follows="left|top"
+   max_length="1024"
    width="240"
    top_delta="20"
    word_wrap="true" />
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 2e1dfa00c7..53796f0959 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -178,7 +178,7 @@
         width="22">
         <button.commit_callback
           function="WebContent.TestURL"
-          parameter="https://sl-viewer-media-system.s3.amazonaws.com/index.html"/>
+          parameter="https://sl-viewer-media-system.s3.amazonaws.com/bookmarks/index.html"/>
       </button>
     </layout_panel>
     <layout_panel
diff --git a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
index d8090070bd..3cfe2e0e6f 100644
--- a/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_gallery_inventory.xml
@@ -687,51 +687,6 @@
      parameter="remove_from_favorites" />
   </menu_item_call>
   <menu
-   label="Use as default for"
-   layout="topleft"
-   name="upload_def">
-    <menu_item_call
-     label="Image uploads"
-     layout="topleft"
-     name="Image uploads">
-      <menu_item_call.on_click
-       function="Inventory.FileUploadLocation"
-        parameter="texture" />
-      <menu_item_call.on_visible
-       function="Inventory.CanSetUploadLocation" />
-    </menu_item_call>
-    <menu_item_call
-     label="Sound uploads"
-     layout="topleft"
-     name="Sound uploads">
-      <menu_item_call.on_click
-       function="Inventory.FileUploadLocation"
-       parameter="sound" />
-      <menu_item_call.on_visible
-       function="Inventory.CanSetUploadLocation" />
-    </menu_item_call>
-    <menu_item_call
-     label="Animation uploads"
-     layout="topleft"
-     name="Animation uploads">
-      <menu_item_call.on_click
-       function="Inventory.FileUploadLocation"
-       parameter="animation" />
-      <menu_item_call.on_visible
-       function="Inventory.CanSetUploadLocation" />
-    </menu_item_call>
-    <menu_item_call
-     label="Model uploads"
-     layout="topleft"
-     name="Model uploads">
-      <menu_item_call.on_click
-       function="Inventory.FileUploadLocation"
-       parameter="model" />
-      <menu_item_call.on_visible
-       function="Inventory.CanSetUploadLocation" />
-    </menu_item_call>
-  </menu>
-  <menu
    label="Upload to folder"
    layout="topleft"
    name="upload_options">
@@ -812,54 +767,69 @@
    label="Use as default for"
    layout="topleft"
    name="upload_def">
-    <menu_item_call
+    <menu_item_check
      label="Image uploads"
      layout="topleft"
      name="Image uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
         parameter="def_texture" />
-      <menu_item_call.on_visible
+      <on_visible
        function="Inventory.CanSetUploadLocation" />
-    </menu_item_call>
-    <menu_item_call
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_texture" />
+    </menu_item_check>
+    <menu_item_check
      label="Sound uploads"
      layout="topleft"
      name="Sound uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_sound" />
-      <menu_item_call.on_visible
+      <on_visible
        function="Inventory.CanSetUploadLocation" />
-    </menu_item_call>
-    <menu_item_call
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_sound" />
+    </menu_item_check>
+    <menu_item_check
      label="Animation uploads"
      layout="topleft"
      name="Animation uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_animation" />
-      <menu_item_call.on_visible
+      <on_visible
        function="Inventory.CanSetUploadLocation" />
-    </menu_item_call>
-    <menu_item_call
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_animation" />
+    </menu_item_check>
+    <menu_item_check
      label="Model uploads"
      layout="topleft"
      name="Model uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_model" />
-      <menu_item_call.on_visible
+      <on_visible
        function="Inventory.CanSetUploadLocation" />
-    </menu_item_call>
-    <menu_item_call
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_model" />
+    </menu_item_check>
+    <menu_item_check
      label="PBR material uploads"
      layout="topleft"
      name="PBR uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_pbr_material" />
-    </menu_item_call>
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_pbr_material" />
+    </menu_item_check>
   </menu>
 	<menu_item_separator
 	 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index f998aefb29..8bbcefceac 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -1064,46 +1064,61 @@
    label="Use as default for"
    layout="topleft"
    name="upload_def">
-    <menu_item_call
+    <menu_item_check
      label="Image uploads"
      layout="topleft"
      name="Image uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_texture" />
-    </menu_item_call>
-    <menu_item_call
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_texture" />
+    </menu_item_check>
+    <menu_item_check
      label="Sound uploads"
      layout="topleft"
      name="Sound uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_sound" />
-    </menu_item_call>
-    <menu_item_call
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_sound" />
+    </menu_item_check>
+    <menu_item_check
      label="Animation uploads"
      layout="topleft"
      name="Animation uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_animation" />
-    </menu_item_call>
-    <menu_item_call
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_animation" />
+    </menu_item_check>
+    <menu_item_check
      label="Model uploads"
      layout="topleft"
      name="Model uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_model" />
-    </menu_item_call>
-    <menu_item_call
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_model" />
+    </menu_item_check>
+    <menu_item_check
      label="PBR material uploads"
      layout="topleft"
      name="PBR uploads">
-      <menu_item_call.on_click
+      <on_click
        function="Inventory.FileUploadLocation"
        parameter="def_pbr_material" />
-    </menu_item_call>
+      <on_check
+       function="Inventory.FileUploadLocation.Check"
+       parameter="def_pbr_material" />
+    </menu_item_check>
   </menu>
 	<menu_item_separator
 	 layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
index f9864637a0..e687ae93e8 100644
--- a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
@@ -40,4 +40,12 @@
     <menu_item_call.on_click
      function="Open.WebInspector" />
   </menu_item_call>
+  <menu_item_call
+   label="Show Source"
+   layout="topleft"
+   name="show_page_source"
+   visible="false">
+    <menu_item_call.on_click
+     function="Open.ShowSource" />
+  </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml
index f3e520700b..d43ce26e56 100644
--- a/indra/newview/skins/default/xui/en/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml
@@ -41,6 +41,17 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
+     label="Zoom in"
+     layout="topleft"
+     name="zoom_in">
+        <menu_item_call.on_click
+         function="ObjectIcon.Action"
+         parameter="obj_zoom_in" />
+        <menu_item_call.on_enable
+         function="ObjectIcon.Visible"
+         parameter="obj_zoom_in" />
+    </menu_item_call>
+    <menu_item_call
      label="Show on Map"
      layout="topleft"
      name="show_on_map">
diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
index 1874c01f8d..fb6081e1fb 100644
--- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
@@ -26,6 +26,13 @@
     <menu_item_separator
      layout="topleft" />
     <menu_item_call
+     label="Zoom in"
+     layout="topleft"
+     name="zoom_in">
+        <menu_item_call.on_click
+         function="Url.ZoomInObject" />
+    </menu_item_call>
+    <menu_item_call
      label="Show on Map"
      layout="topleft"
      name="show_on_map">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b182a241d8..536008c85c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2239,6 +2239,25 @@ Couldn&apos;t open uploaded sound file for reading:
 
   <notification
    icon="alertmodal.tga"
+   name="ModelUploaderMissingPhysicsApple"
+   type="alertmodal">
+Model upload is not yet available on Apple Silicon, but will be supported in an upcoming release.
+   
+Workaround: Right-click the Second Life app in Finder, select
+"Get Info", then check "Open using Rosetta"
+  <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ModelUploaderMissingPhysics"
+   type="alertmodal">
+Physics library is not present, some of the model uploader's functionality might not work or might not work correctly.
+  <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="SoundFileNotRIFF"
    type="alertmodal">
 File does not appear to be a RIFF WAVE file:
@@ -12147,6 +12166,17 @@ Cannot create large prims that intersect other residents.  Please re-try when ot
 
   <notification
    icon="alertmodal.tga"
+   name="PreferenceQualityWithLowMemory"
+   type="alert">
+Your system has [TOTAL_MEM]MB of memory, which might not be enough to run viewer at higher settings and might result in issues.
+      <usetemplate
+       name="okcancelbuttons"
+       notext="Cancel"
+       yestext="Continue"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="DefaultObjectPermissions"
    type="alert">
 	There was a problem saving the default object permissions: [REASON].  Please try setting the default permissions later.
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index c31e6c94ea..1be34550fa 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -177,6 +177,25 @@ Learn about [https://community.secondlife.com/knowledgebase/joining-and-particip
                      function="People.DelFriend" />
                  </dnd_button>
             </panel>
+            <slider
+              control_name="NearMeRange"
+              decimal_digits="0"
+              increment="1"
+              follows="left|top"
+              left="5"
+              min_val="0"
+              max_val="4096"
+              label="Range:"
+              name="near_me_range"
+              tool_tip="Nearby people range"
+              width="230"/>
+            <text
+              type="string"
+              follows="left|top"
+              left_delta="225"
+              name="near_me_range_text2">
+              m
+            </text>
          <layout_stack
            clip="false"
            follows="all"
@@ -216,7 +235,7 @@ Learn about [https://community.secondlife.com/knowledgebase/joining-and-particip
              <avatar_list
                allow_select="true"
                follows="all"
-               height="211"
+               height="197"
                ignore_online_status="true"
                layout="topleft"
                left="3"
diff --git a/indra/newview/skins/default/xui/es/floater_search.xml b/indra/newview/skins/default/xui/es/floater_search.xml
deleted file mode 100644
index e24d8064a1..0000000000
--- a/indra/newview/skins/default/xui/es/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		Cargando...
-	</floater.string>
-	<floater.string name="done_text">
-		Hecho
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Redo search to reflect current God level
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_search.xml b/indra/newview/skins/default/xui/fr/floater_search.xml
deleted file mode 100644
index 32800182ea..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		Chargement...
-	</floater.string>
-	<floater.string name="done_text">
-		Terminé
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Relancer la recherche pour refléter le niveau divin actuel
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_search.xml b/indra/newview/skins/default/xui/it/floater_search.xml
deleted file mode 100644
index ac3dc17aa3..0000000000
--- a/indra/newview/skins/default/xui/it/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		Caricamento in corso...
-	</floater.string>
-	<floater.string name="done_text">
-		Fine
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Ripeti ricerca in modo che rifletta il livello di diritti Admin attuale
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_search.xml b/indra/newview/skins/default/xui/ja/floater_search.xml
deleted file mode 100644
index 531ac77f95..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		読み込んでいます…。
-	</floater.string>
-	<floater.string name="done_text">
-		完了
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				現在のゴッドレベルに反映させるため、検索をやり直してください。
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_search.xml b/indra/newview/skins/default/xui/pt/floater_search.xml
deleted file mode 100644
index 3509cb786d..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		Carregando...
-	</floater.string>
-	<floater.string name="done_text">
-		Pronto
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Buscar novamente com status God
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_search.xml b/indra/newview/skins/default/xui/ru/floater_search.xml
deleted file mode 100644
index 405a6598ac..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		Загрузка...
-	</floater.string>
-	<floater.string name="done_text">
-		Готово
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Повторить поиск, чтобы показать текущий уровень творца
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_search.xml b/indra/newview/skins/default/xui/tr/floater_search.xml
deleted file mode 100644
index 08c1e5162c..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		Yükleniyor...
-	</floater.string>
-	<floater.string name="done_text">
-		Tamamlandı
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				Mevcut Yönetici seviyesini dikkate alarak aramayı yenile
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_search.xml b/indra/newview/skins/default/xui/zh/floater_search.xml
deleted file mode 100644
index 3e85a529ae..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_search.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_search" title="">
-	<floater.string name="loading_text">
-		載入中...
-	</floater.string>
-	<floater.string name="done_text">
-		完成
-	</floater.string>
-	<layout_stack name="stack1">
-		<layout_panel name="browser_layout">
-			<text name="refresh_search">
-				以目前具備的神階級再搜尋一次
-			</text>
-		</layout_panel>
-	</layout_stack>
-</floater>