SL-18809: Merge 'DRTVWR-559' of secondlife/viewer into sl-18809

5 files changed, 91 insertions, 60 deletions

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 75b50c0e39..7f03fbe7c3 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
@@ -647,32 +647,58 @@
        name="2"
        value="2"/>
   </combo_box>
+
+  <check_box
+    control_name="RenderReflectionsEnabled"
+    height="16"
+    initial_value="true"
+    label="Reflections"
+    layout="topleft"
+    left="420"
+    name="ReflectionsEnabled"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
+
+  <check_box
+    control_name="RenderScreenSpaceReflections"
+    height="16"
+    initial_value="true"
+    label="Screen Space Reflections"
+    layout="topleft"
+    left="440"
+    name="ScreenSpaceReflections"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.RenderOptionUpdate" />
+  </check_box>
+  
   <text
     type="string"
     length="1"
     follows="left|top"
     height="16"
     layout="topleft"
-    left="420"
-    name="RenderReflectionDetailText"
+    left="440"
+    name="ReflectionDetailText"
     text_readonly_color="LabelDisabledColor"
     top_delta="16"
     width="128">
-    Reflections:
+    Reflection Detail:
   </text>
+
   <combo_box
    control_name="RenderReflectionProbeDetail"
    height="18"
    layout="topleft"
-   left_delta="130"
+   left_delta="110"
    top_delta="0"
    name="ReflectionDetail"
    width="150">
     <combo_box.item
-      label="Disabled"
-      name="0"
-      value="-1"/>
-    <combo_box.item
       label="Static Only"
       name="0"
       value="0"/>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_add.xml b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
index fa40c5df90..b04215872c 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -47,13 +47,23 @@
                  label="Model..."
                  layout="topleft"
                  name="Upload Model">
-                <menu_item_call.on_click
-                 function="File.UploadModel"
-                 parameter="" />
-                <menu_item_call.on_enable
-                 function="File.EnableUploadModel" />
-                <menu_item_call.on_visible
-                function="File.VisibleUploadModel"/>
+                   <menu_item_call.on_click
+                    function="File.UploadModel"
+                    parameter="" />
+                   <menu_item_call.on_enable
+                    function="File.EnableUploadModel" />
+                   <menu_item_call.on_visible
+                    function="File.VisibleUploadModel"/>
+                </menu_item_call>
+                <menu_item_call
+                 label="Material..."
+                 layout="topleft"
+                 name="Upload Material">
+                    <menu_item_call.on_click
+                     function="File.UploadMaterial"
+                     parameter="" />
+                    <menu_item_call.on_enable
+                     function="File.EnableUploadMaterial" />
                 </menu_item_call>
                 <menu_item_call
                  label="Bulk..."
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index cb1dec6c61..a3c365e60c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3247,16 +3247,6 @@ function="World.EnvPreset"
                  function="Advanced.HandleAttachedLightParticles"
                  parameter="RenderAttachedParticles" />
             </menu_item_check>
-            <menu_item_check
-             label="Hover Glow Objects"
-             name="Hover Glow Objects">
-                <menu_item_check.on_check
-                 function="CheckControl"
-                 parameter="RenderHoverGlowEnable" />
-                <menu_item_check.on_click
-                 function="ToggleControl"
-                 parameter="RenderHoverGlowEnable" />
-            </menu_item_check>
             <menu_item_call
               enabled="true"
               label="Rebuild Reflection Probes"
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index ba5a20dd22..3bcbe0ca3a 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -891,6 +891,40 @@
              max_val="1"
              name="shinyOffsetV"
              width="265" />
+            <check_box
+             follows="top|left"
+             height="16"
+             initial_value="false"
+             label="Align planar faces"
+             layout="topleft"
+             left="7"
+             name="checkbox planar align"
+             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
+             top_delta="20"
+             width="260" />
+			<button
+             follows="left|top"
+             layout="topleft"
+			 left="9"
+			 top="231"
+			 height="20"
+			 label="Align"
+			 label_selected="Align current texture layers"
+			 name="button align textures"
+			 tool_tip="Align current texture layers"
+			 width="66" />
+            <web_browser
+             visible="false"
+             enabled="false"
+             border_visible="true"
+             bottom_delta="0"
+             follows="top|left"
+             left="0"
+             name="title_media"
+             width="4"
+             height="4"
+             start_url="about:blank"
+             decouple_texture_size="true" />
             <!-- BEGIN PBR Material texture transform parameters -->
             <spinner
              follows="left|top"
@@ -903,7 +937,7 @@
              min_val="-100"
              max_val="100"
              name="gltfTextureScaleU"
-             top_delta="-115"
+             top_delta="34"
              width="265" />
             <spinner
              follows="left|top"
@@ -954,38 +988,4 @@
              name="gltfTextureOffsetV"
              width="265" />
             <!-- END PBR Material texture transform parameters -->
-            <check_box
-             follows="top|left"
-             height="16"
-             initial_value="false"
-             label="Align planar faces"
-             layout="topleft"
-             left="7"
-             name="checkbox planar align"
-             tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
-             top_delta="43"
-             width="260" />
-			<button
-             follows="left|top"
-             layout="topleft"
-			 left="9"
-			 top="231"
-			 height="20"
-			 label="Align"
-			 label_selected="Align current texture layers"
-			 name="button align textures"
-			 tool_tip="Align current texture layers"
-			 width="66" />
-            <web_browser
-             visible="false"
-             enabled="false"
-             border_visible="true"
-             bottom_delta="0"
-             follows="top|left"
-             left="0"
-             name="title_media"
-             width="4"
-             height="4"
-             start_url="about:blank"
-             decouple_texture_size="true" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e7e1a24f5e..255aff06be 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -319,6 +319,11 @@ Only items with unrestricted
 'next owner' permissions
 can be attached to notecards.
 	</string>
+	<string name="TooltipTextureRestrictedDrop">
+Only textures with unrestricted
+copy and transfer permissions
+are allowed.
+	</string>
 
 	<!-- searching - generic -->
 	<string name="Searching">Searching...</string>