Merge tag '7.1.8-release'

source for viewer 7.1.8.9375512768

16 files changed, 496 insertions, 91 deletions

diff --git a/indra/newview/skins/default/xui/de/panel_region_terrain.xml b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
index 42ba5b5269..7738427fe3 100644
--- a/indra/newview/skins/default/xui/de/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_terrain.xml
@@ -10,7 +10,7 @@
 	<spinner label="Obere Terraingrenze" name="terrain_raise_spin"/>
 	<spinner label="Untere Terraingrenze" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-    Terraintexturen (erfordert 24-Bit-.tga-Dateien mit einer Größe von 1024x1024)
+    Terraintexturen
   </text>
 	<text name="height_text_lbl">
 		1 (niedrig)
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 bc237322af..94c889f4e4 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
@@ -335,21 +335,9 @@
       name="FSAADisabled"
       value="0" />
     <combo_box.item
-      label="2x"
-      name="2x"
+      label="FXAA"
+      name="FXAA"
       value="2" />
-    <combo_box.item
-     label="4x"
-     name="4x"
-     value="4" />
-    <combo_box.item
-     label="8x"
-     name="8x"
-     value="8" />
-    <combo_box.item
-     label="16x"
-     name="16x"
-     value="16" />
   </combo_box>
   <text
     type="string"
@@ -357,44 +345,23 @@
     follows="left|top"
     height="16"
     layout="topleft"
-    left_pad="10"
-    name="antialiasing restart"
-    top_delta="0"
-    width="130">
-     (requires restart)
-  </text>
-   <view_border
-      bevel_style="in"
-      height="322"
-      layout="topleft"
-      left="385"
-      name="vert_border"
-      top="16"      
-      width="0"/>
-  <text
-    type="string"
-    length="1"
-    follows="left|top"
-    height="16"
-    layout="topleft"
     name="MeshText"
-    top_delta="20"
-    left="400"
-  	top="21"
+    top_delta="16"
+    left="10"
     width="128">
-     Mesh
+    Mesh
   </text>
 
   <slider
     control_name="RenderTerrainLODFactor"
-    follows="left|top"
+    follows="topleft"
     height="16"
     increment="0.125"
     initial_value="160"
     label="Terrain Mesh Detail:"
     label_width="185"
     layout="topleft"
-    left="420"
+    left="30"
     min_val="1"
     max_val="2"
     name="TerrainMeshDetail"
@@ -408,7 +375,7 @@
   <text
     type="string"
     length="1"
-    follows="left|top"
+    follows="topleft"
     height="16"
     layout="topleft"
     name="TerrainMeshDetailText"
@@ -416,19 +383,19 @@
     top_delta="0"
     left_delta="304"
     width="65">
-       Low
+    Low
   </text>
 
   <slider
     control_name="RenderTreeLODFactor"
-    follows="left|top"
+    follows="topleft"
     height="16"
     increment="0.125"
     initial_value="160"
     label="Trees:"
     label_width="185"
     layout="topleft"
-    left="420"
+    left="30"
     name="TreeMeshDetail"
     show_text="false"
     top_delta="16"
@@ -447,7 +414,7 @@
     top_delta="0"
     left_delta="304"
     width="65">
-       Low
+    Low
   </text>
 
   <slider
@@ -459,7 +426,7 @@
     label="Objects:"
     label_width="185"
     layout="topleft"
-    left="420"
+    left="30"
     min_val="0"
     max_val="4"
     name="ObjectMeshDetail"
@@ -480,7 +447,7 @@
     top_delta="0"
     left_delta="304"
     width="65">
-       Low
+    Low
   </text>
 
   <slider
@@ -491,7 +458,7 @@
     label="Flexiprims:"
     label_width="185"
     layout="topleft"
-    left="420"
+    left="30"
     name="FlexibleMeshDetail"
     show_text="false"
     top_delta="16"
@@ -510,8 +477,28 @@
     top_delta="0"
     left_delta="304"
     width="65">
-       Low
+    Low
   </text>
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left_pad="10"
+    name="antialiasing restart"
+    top_delta="0"
+    width="130">
+     (requires restart)
+  </text>
+   <view_border
+      bevel_style="in"
+      height="322"
+      layout="topleft"
+      left="385"
+      name="vert_border"
+      top="16"      
+      width="0"/>
   
   <text
     type="string"
@@ -520,7 +507,7 @@
     height="16"
     layout="topleft"
     name="ShadersText"
-    top_delta="20"
+    top_delta="-10"
     left="400"
     width="128">
      Shaders
@@ -534,7 +521,7 @@
     layout="topleft"
     left="420"
     name="TransparentWater"
-    top_delta="16"
+    top_delta="18"
     width="300">
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
@@ -555,7 +542,7 @@
     max_val="128"
     name="SkyMeshDetail"
     show_text="false"
-    top_delta="16"
+    top_delta="22"
     width="260">
     <slider.commit_callback
       function="Pref.UpdateSliderText"
@@ -583,7 +570,7 @@
     layout="topleft"
     left="420"
     name="UseSSAO"
-    top_delta="16"
+    top_delta="22"
     width="240">
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
@@ -597,7 +584,7 @@
     layout="topleft"
     left="420"
     name="UseDoF"
-    top_delta="16"
+    top_delta="20"
     width="240">
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
@@ -612,7 +599,7 @@
     left="420"
     name="RenderShadowDetailText"
     text_readonly_color="LabelDisabledColor"
-    top_delta="16"
+    top_delta="22"
     width="128">
       Shadows:
   </text>
@@ -646,7 +633,7 @@
     layout="topleft"
     left="420"
     name="ScreenSpaceReflections"
-    top_delta="16"
+    top_delta="24"
     width="240">
     <check_box.commit_callback
       function="Pref.RenderOptionUpdate" />
@@ -661,7 +648,7 @@
     left="420"
     name="ReflectionDetailText"
     text_readonly_color="LabelDisabledColor"
-    top_delta="16"
+    top_delta="22"
     width="128">
     Reflection Detail:
   </text>
@@ -697,7 +684,7 @@
     left="420"
     name="ReflectionProbeText"
     text_readonly_color="LabelDisabledColor"
-    top_delta="16"
+    top_delta="22"
     width="128">
     Reflection Coverage:
   </text>
@@ -743,10 +730,106 @@
     max_val="1.5"
     name="RenderExposure"
     show_text="true"
-    top_delta="20"
+    top_delta="24"
     width="260">
   </slider>
 
+  <!-- Mirror settings. -->
+  <check_box
+    control_name="RenderMirrors"
+    height="16"
+    initial_value="false"
+    label="Mirrors"
+    layout="topleft"
+    left="420"
+    name="Mirrors"
+    top_delta="24"
+    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="MirrorResolutionText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="22"
+    width="128">
+    Mirror Resolution:
+  </text>
+
+  <combo_box
+   control_name="RenderHeroProbeResolution"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0"
+   name="MirrorResolution"
+   width="150">
+    <combo_box.item
+      label="256"
+      name="0"
+      value="256"/>
+    <combo_box.item
+      label="512"
+      name="1"
+      value="512"/>
+    <combo_box.item
+      label="1024"
+      name="2"
+      value="1024"/>
+    <combo_box.item
+      label="2048"
+      name="3"
+      value="2048"/>
+  </combo_box>
+
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="420"
+    name="HeroProbeUpdateText"
+    text_readonly_color="LabelDisabledColor"
+    top_delta="22"
+    width="128">
+    Mirror Update Rate:
+  </text>
+
+  <combo_box
+   control_name="RenderHeroProbeUpdateRate"
+   height="18"
+   layout="topleft"
+   left_delta="130"
+   top_delta="0"
+   name="HeroProbeUpdateRate"
+   width="150">
+    <combo_box.item
+      label="Every Frame"
+      name="0"
+      value="1"/>
+    <combo_box.item
+      label="Every 2nd Frame"
+      name="1"
+      value="2"/>
+    <combo_box.item
+      label="Every 3rd Frame"
+      name="2"
+      value="3"/>
+    <combo_box.item
+      label="Every 4th Frame"
+      name="3"
+      value="4"/>
+  </combo_box>
+  <!-- End of mirror settings -->
+
   <!-- End of Advanced Settings block -->
 	<view_border
       bevel_style="in"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 5c5dba96a5..c88e4163be 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2410,7 +2410,6 @@ even though the user gets a free copy.
              name="object_horizontal"
              top_pad="10"
              width="278" />
-
             <check_box
              height="16"
              label="Light"
@@ -2550,7 +2549,7 @@ even though the user gets a free copy.
 			   follows="left|top"
 			   name="Probe Volume Type"
 			   tool_tip="Choose the probe influence volume"
-			   width="108">
+			   width="140">
             <combo_box.item
              label="Sphere"
              name="Sphere"
@@ -2560,16 +2559,56 @@ even though the user gets a free copy.
              name="Box"
              value="Box"/>
           </combo_box>
+
           <check_box
-             height="16"
-             label="Dynamic"
+           height="16"
+           label="Dynamic"
+           layout="topleft"
+           left="10"
+           name="Probe Dynamic"
+           tool_tip="When enabled, Avatars will appear in reflections within this probe's influence volume."
+           bottom_delta="19"
+           width="60" />
+          
+          <text
+            bottom_delta="-8"
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
              layout="topleft"
              left="10"
-             name="Probe Dynamic"
-             tool_tip="When enabled, Avatars will appear in reflections within this probe's influence volume."
-             bottom_delta="19"
-             width="60" />
-          <spinner bottom_delta="19"
+             name="Probe Update Label"
+             text_readonly_color="LabelDisabledColor"
+             width="100">
+            Probe Update
+          </text>
+          <combo_box
+			   height="19"
+			   top_delta="0"
+         left="144"
+			   follows="left|top"
+			   name="Probe Update Type"
+			   tool_tip="Determines how the probe updates.  Static updates the slowest and without avatars.  Dynamic updates more frequently, with avatars visible in the probes.  Mirror (Environment) turns this probe into a realtime planar projected probe that only reflects the environment, but does not calculate ambiance.  Mirror (Everything) is similar to Mirror (Environment), but it reflects particles and avatars."
+			   width="140">
+            <combo_box.item
+             label="Static"
+             name="Static"
+             value="Static" />
+            <combo_box.item
+             label="Dynamic"
+             name="Dynamic"
+             value="Dynamic"/>
+            <combo_box.item
+             label="Mirror (Environment)"
+             name="Mirror"
+             value="Mirror"/>
+            <combo_box.item
+             label="Mirror (Everything)"
+             name="Dynamic Mirror"
+             value="Dynamic Mirror"/>
+          </combo_box>
+          <spinner bottom_delta="17"
                    decimal_digits="3"
                    follows="left|top"
                    height="16"
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 13064db712..ae96289f36 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_add.xml
@@ -13,7 +13,7 @@
              name="upload"
              tear_off="true">
                 <menu_item_call
-                 label="Image (L$[COST])..."
+                 label="Image..."
                  layout="topleft"
                  name="Upload Image"
                  shortcut="control|U">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5b0ebf1110..f3d44cf647 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1657,7 +1657,7 @@ function="World.EnvPreset"
          name="Upload"
          tear_off="true">
             <menu_item_call
-             label="Image (L$[COST])..."
+             label="Image..."
              layout="topleft"
              name="Upload Image"
              shortcut="control|U">
@@ -2076,7 +2076,57 @@ function="World.EnvPreset"
                  function="Advanced.ToggleRenderType"
                  parameter="simple" />
             </menu_item_check>
-            <menu_item_check
+          <menu_item_check
+             label="Materials"
+             name="Rendering Type Materials">
+            <menu_item_check.on_check
+             function="Advanced.CheckRenderType"
+             parameter="materials" />
+            <menu_item_check.on_click
+             function="Advanced.ToggleRenderType"
+             parameter="materials" />
+          </menu_item_check>
+          <menu_item_check
+             label="Alpha Mask"
+             name="Rendering Type Alpha Mask">
+            <menu_item_check.on_check
+             function="Advanced.CheckRenderType"
+             parameter="alpha_mask" />
+            <menu_item_check.on_click
+             function="Advanced.ToggleRenderType"
+             parameter="alpha_mask" />
+          </menu_item_check>
+          <menu_item_check
+             label="Fullbright Alpha Mask"
+             name="Rendering Type Fullbright Alpha Mask">
+            <menu_item_check.on_check
+             function="Advanced.CheckRenderType"
+             parameter="fullbright_alpha_mask" />
+            <menu_item_check.on_click
+             function="Advanced.ToggleRenderType"
+             parameter="fullbright_alpha_mask" />
+          </menu_item_check>
+          <menu_item_check
+             label="Glow"
+             name="Rendering Type Glow">
+            <menu_item_check.on_check
+             function="Advanced.CheckRenderType"
+             parameter="glow" />
+            <menu_item_check.on_click
+             function="Advanced.ToggleRenderType"
+             parameter="glow" />
+          </menu_item_check>
+          <menu_item_check
+             label="Fullbright"
+             name="Rendering Type Glow">
+            <menu_item_check.on_check
+             function="Advanced.CheckRenderType"
+             parameter="fullbright" />
+            <menu_item_check.on_click
+             function="Advanced.ToggleRenderType"
+             parameter="fullbright" />
+          </menu_item_check>
+          <menu_item_check
              label="Alpha"
              name="Rendering Type Alpha"
              shortcut="control|alt|shift|2">
@@ -2854,6 +2904,18 @@ function="World.EnvPreset"
               <menu_item_call.on_click
                function="Advanced.ClickRenderBenchmark" />
           </menu_item_call>
+          <menu_item_call
+           label="HDRI Preview"
+           name="HDRI Preview">
+            <menu_item_call.on_click
+             function="Advanced.ClickHDRIPreview" />
+          </menu_item_call>
+          <menu_item_call
+           label="GLTF Scene Preview"
+           name="GLTF Scene Preview">
+            <menu_item_call.on_click
+             function="Advanced.ClickGLTFScenePreview" />
+          </menu_item_call>
         </menu>
       <menu
         create_jump_keys="true"
@@ -2891,6 +2953,16 @@ function="World.EnvPreset"
            parameter="octree" />
         </menu_item_check>
         <menu_item_check
+         label="GLTF Nodes"
+         name="GLTF Nodes">
+          <menu_item_check.on_check
+           function="Advanced.CheckInfoDisplay"
+           parameter="nodes" />
+          <menu_item_check.on_click
+           function="Advanced.ToggleInfoDisplay"
+           parameter="nodes" />
+        </menu_item_check>
+        <menu_item_check
          label="Shadow Frusta"
          name="Shadow Frusta">
           <menu_item_check.on_check
@@ -3333,6 +3405,13 @@ function="World.EnvPreset"
             <menu_item_call.on_click
              function="Advanced.ClearShaderCache" />
           </menu_item_call>
+          <menu_item_call
+            enabled="true"
+            label="Rebuild Terrain"
+            name="Rebuild Terrain">
+            <menu_item_call.on_click
+             function="Advanced.RebuildTerrain" />
+          </menu_item_call>
           <menu_item_separator />
           <menu_item_call
             enabled="true"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7d237c6edd..b9d0ef0cc7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4011,10 +4011,39 @@ Are you sure you want to return objects owned by [USER_NAME]?
    icon="alertmodal.tga"
    name="InvalidTerrainBitDepth"
    type="alertmodal">
+    <unique combine="cancel_old" />
 Couldn&apos;t set region textures:
 Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
 
-Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click &quot;Apply&quot; again.
+Replace texture [TEXTURE_NUM] with an RGB [MAX_SIZE]x[MAX_SIZE] or smaller image then click &quot;Apply&quot; again.
+  <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidTerrainAlphaNotFullyLoaded"
+   type="alertmodal">
+    <unique combine="cancel_old" />
+Couldn&apos;t set region textures:
+Terrain texture [TEXTURE_NUM] is not fully loaded, but is assumed to contain transparency due to a bit depth of [TEXTURE_BIT_DEPTH]. Transparency is not currently supported for terrain textures.
+
+If texture [TEXTURE_NUM] is opaque, wait for the texture to fully load and then click &quot;Apply&quot; again.
+
+Alpha is only supported for terrain materials (PBR Metallic Roughness), when alphaMode="MASK" and doubleSided=false.
+  <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidTerrainAlpha"
+   type="alertmodal">
+    <unique combine="cancel_old" />
+Couldn&apos;t set region textures:
+Terrain texture [TEXTURE_NUM] contains transparency. Transparency is not currently supported for terrain textures.
+
+Replace texture [TEXTURE_NUM] with an opaque RGB image, then click &quot;Apply&quot; again.
+
+Alpha is only supported for terrain materials (PBR Metallic Roughness), when alphaMode="MASK" and doubleSided=false.
   <tag>fail</tag>
   </notification>
 
@@ -4022,10 +4051,55 @@ Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller ima
    icon="alertmodal.tga"
    name="InvalidTerrainSize"
    type="alertmodal">
+    <unique combine="cancel_old" />
 Couldn&apos;t set region textures:
 Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
 
-Replace texture [TEXTURE_NUM] with a 24-bit [MAX_SIZE]x[MAX_SIZE] or smaller image then click &quot;Apply&quot; again.
+Replace texture [TEXTURE_NUM] with an RGB [MAX_SIZE]x[MAX_SIZE] or smaller image then click &quot;Apply&quot; again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidTerrainMaterialNotLoaded"
+   type="alertmodal">
+    <unique combine="cancel_old" />
+Couldn&apos;t set region materials:
+Terrain material [MATERIAL_NUM] is not loaded.
+
+Wait for the material to load, or replace material [MATERIAL_NUM] with a valid material.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidTerrainMaterialLoadFailed"
+   type="alertmodal">
+    <unique combine="cancel_old" />
+Couldn&apos;t set region materials:
+Terrain material [MATERIAL_NUM] failed to load.
+
+Replace material [MATERIAL_NUM] with a valid material.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidTerrainMaterialDoubleSided"
+   type="alertmodal">
+    <unique combine="cancel_old" />
+Couldn&apos;t set region materials:
+Terrain material [MATERIAL_NUM] is double-sided. Double-sided materials are not currently supported for PBR terrain.
+
+Replace material [MATERIAL_NUM] with a material with doubleSided=false.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidTerrainMaterialAlphaMode"
+   type="alertmodal">
+    <unique combine="cancel_old" />
+Couldn&apos;t set region materials:
+Terrain material [MATERIAL_NUM] is using the unsupported alphaMode="[MATERIAL_ALPHA_MODE]".
+
+Replace material [MATERIAL_NUM] with a material with alphaMode="OPAQUE" or alphaMode="MASK".
   </notification>
 
   <notification
@@ -9295,6 +9369,15 @@ Unable to upload texture: &apos;[NAME]&apos;
   </notification>
 
   <notification
+ icon="alertmodal.tga"
+ name="CannotLoad"
+ type="alertmodal">
+    Unable to load [WHAT].
+    [REASON]
+    <tag>fail</tag>
+  </notification>
+
+  <notification
    icon="alertmodal.tga"
    name="CannotUploadMaterial"
    type="alertmodal">
@@ -12364,5 +12447,16 @@ are wearing now.
         name="okignore"
         yestext="OK"/>
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="GLTFPreviewSelection"
+   type="alert">
+    You must select an object to act as a handle to the GLTF asset you are previewing.
+    <tag>fail</tag>
+    <usetemplate
+      name="okbutton"
+      yestext="OK"/>
+  </notification>
+
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
index ad41691323..73e0a1000f 100644
--- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml
@@ -79,26 +79,55 @@
     <text
      type="string"
      length="1"
+     halign="left"
+     valign="center"
      follows="left|top"
      height="20"
      layout="topleft"
-     left="10"
      name="detail_texture_text"
-     top="110"
-     width="300">
-        Terrain Textures (requires 1024x1024, 24 bit .tga files)
+     left="10"
+     top="105"
+     width="170">
+        Terrain Textures
     </text>
+    <text
+     type="string"
+     length="1"
+     halign="left"
+     valign="center"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     name="detail_material_text"
+     left="10"
+     top="105"
+     width="170">
+        Terrain Materials
+    </text>
+    <check_box
+     height="20"
+     halign="left"
+     valign="center"
+     follows="left|top"
+     layout="topleft"
+     top_delta="1"
+     left_delta="180"
+     label="PBR Metallic Roughness"
+     name="terrain_material_type"
+     tool_tip="If checked, use PBR Metallic Roughness materials for terrain. Otherwise, use textures."
+     left_pad="2"
+     width="200" />
     <texture_picker
      follows="left|top"
      height="100"
      layout="topleft"
-     left_delta="0"
+     left="10"
      name="texture_detail_0"
      default_image_id="0bc58228-74a0-7e83-89bc-5c23464bcec5"
-     top_delta="20"
+     top_delta="30"
      width="100" />
     <texture_picker
-     follows="left|top"
+     follows="top"
      height="100"
      layout="topleft"
      left_pad="10"
@@ -124,6 +153,50 @@
      default_image_id="53a2f406-4895-1d13-d541-d2e3b86bc19c"
      top_delta="0"
      width="100" />
+    <texture_picker
+     visible="false"
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left="10"
+     name="material_detail_0"
+     pick_type="material"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     visible="false"
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="material_detail_1"
+     pick_type="material"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     visible="false"
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="material_detail_2"
+     pick_type="material"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+     top_delta="0"
+     width="100" />
+    <texture_picker
+     visible="false"
+     follows="left|top"
+     height="100"
+     layout="topleft"
+     left_pad="10"
+     name="material_detail_3"
+     pick_type="material"
+     default_image_id="968cbad0-4dad-d64e-71b5-72bf13ad051a"
+     top_delta="0"
+     width="100" />
     <text
      type="string"
      length="1"
@@ -185,6 +258,19 @@
         Texture Elevation Ranges
     </text>
     <text
+     visible="false"
+     type="string"
+     length="1"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl5_material"
+     top_delta="0"
+     width="300">
+        Material Elevation Ranges
+    </text>
+    <text
      follows="left|top"
      height="20"
      layout="topleft"
@@ -196,6 +282,18 @@
       These values represent the blend range for the textures above.
     </text>
     <text
+     visible="false"
+     follows="left|top"
+     height="20"
+     layout="topleft"
+     left="10"
+     name="height_text_lbl10_material"
+     top_delta="0"
+     width="200"
+     word_wrap="true">
+      These values represent the blend range for the materials above.
+    </text>
+    <text
        follows="left|top"
        height="60"
        layout="topleft"
@@ -207,6 +305,18 @@
         Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
     </text>
     <text
+       visible="false"
+       follows="left|top"
+       height="60"
+       layout="topleft"
+       left_delta="0"
+       name="height_text_lbl11_material"
+       top_delta="0"
+       width="200"
+       word_wrap="true">
+        Measured in meters, the LOW value is the MAXIMUM height of Material #1, and the HIGH value is the MINIMUM height of Material #4.
+    </text>
+    <text
      follows="left|top"
      height="20"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index 9aba5299cb..5e6e89893e 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -12,7 +12,7 @@ del terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Límite de bajada del 
 terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-    Texturas del terreno (requiere archivos .tga de 1024x1024, 24 bits)
+    Texturas del terreno
   </text>
 	<text name="height_text_lbl">
 		1 (bajo)
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index bbab00ca24..d99948804a 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -12,7 +12,7 @@ terrain" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite d&apos;abaissement 
 du terrain" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-    Textures du terrain (fichiers .tga 1024 x 1024, 24 bit requis)
+    Textures du terrain
   </text>
 	<text name="height_text_lbl">
 		1 (Bas)
diff --git a/indra/newview/skins/default/xui/it/panel_region_terrain.xml b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
index e08c55f63b..0583b4e02e 100644
--- a/indra/newview/skins/default/xui/it/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_terrain.xml
@@ -12,7 +12,7 @@ terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite di abbassamento 
 del terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-    Texture terreno (richiede file 1024x1024, 24 bit .tga)
+    Texture terreno
   </text>
 	<text name="height_text_lbl">
 		1 (basso)
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index 5470bd6e3b..11e8d0d169 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
@@ -10,7 +10,7 @@
 	<spinner label="地形の上昇限度" name="terrain_raise_spin"/>
 	<spinner label="地形の下降限度" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		地形テクスチャ（1024✕1024 の 24 bit .tga ファイル）
+		地形テクスチャ
 	</text>
 	<text name="height_text_lbl">
 		１（低）
diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
index 2d4286334f..c1dde04ff0 100644
--- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml
@@ -7,7 +7,7 @@
 	<spinner label="Górny limit terenu" name="terrain_raise_spin" />
 	<spinner label="Dolny limit terenu" name="terrain_lower_spin" />
 	<text name="detail_texture_text">
-		Tekstury terenu (1024x1024, 24 bitowy plik .tga)
+		Tekstury terenu
 	</text>
 	<text name="height_text_lbl">
 		1 (Nisko)
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index 1d312aeed9..92d6859882 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -12,7 +12,7 @@ terreno" name="terrain_raise_spin"/>
 	<spinner bottom_delta="-34" label="Limite mais baixo do 
 terreno" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-    Texturas de terreno (exige arquivos .tga 1024x1024, 24 bit)
+    Texturas de terreno
   </text>
 	<text name="height_text_lbl">
 		1 (Baixo)
diff --git a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
index 76b4f513a8..2752d409cb 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_terrain.xml
@@ -10,7 +10,7 @@
 	<spinner label="Верх. точка ландшафта" name="terrain_raise_spin"/>
 	<spinner label="Ниж. точка ландшафта" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-    Текстуры ландшафта (требования: 1024x1024, 24-битные, TGA)
+    Текстуры ландшафта
   </text>
 	<text name="height_text_lbl">
 		1 (Низ)
diff --git a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
index e25047301d..00560d4c5b 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_terrain.xml
@@ -10,7 +10,7 @@
 	<spinner label="Yüzey Yükslt. Limiti" name="terrain_raise_spin"/>
 	<spinner label="Yüzey Alçatma Limiti" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-    Yüzey Dokuları (1024x1024, 24 bit .tga dosyalar gerektirir)
+    Yüzey Dokuları
   </text>
 	<text name="height_text_lbl">
 		1 (Düşük)
diff --git a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
index 81bce46876..8490eeaafc 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_terrain.xml
@@ -10,7 +10,7 @@
 	<spinner label="地形提升限制" name="terrain_raise_spin"/>
 	<spinner label="地形降低限制" name="terrain_lower_spin"/>
 	<text name="detail_texture_text">
-		地形材質（須 1024x1024，24 位元 .tga 檔格式）
+		地形材質
 	</text>
 	<text name="height_text_lbl">
 		1（低）