Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_import

6 files changed, 223 insertions, 102 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 80b6427738..f8543ba1aa 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -14,7 +14,7 @@
  legacy_header_height="25">
 
   <string name="status_idle"></string>
-  <string name="status_parse_error">Error: Dae parsing issue - see log for details.</string>
+  <string name="status_parse_error">Error: Model parsing issue - see log for details.</string>
   <string name="status_bind_shape_orientation">Warning: bind shape matrix is not in standard X-forward orientation.</string>
   <string name="status_material_mismatch">Error: Material of model is not a subset of reference model.</string>
   <string name="status_reading_file">Loading...</string>
@@ -66,6 +66,7 @@
   <string name="NoScenesFound">No scenes defined in GLTF file</string>
   <string name="InvalidMeshReference">Node [NODE_NAME] references invalid mesh [MESH_INDEX] (total meshes: [TOTAL_MESHES])</string>
   <string name="InvalidGeometryNonTriangulated">Mesh [MESH_NAME] primitive [PRIMITIVE_INDEX]: Invalid geometry with [INDEX_COUNT] indices (must be triangulated)</string>
+  <string name="EmptyVertexArray">Mesh [MESH_NAME] primitive [PRIMITIVE_INDEX]: Empty vertex array</string>
   <string name="ErrorIndexLimit">Unable to process mesh [MESH_NAME] due to 65,534 vertex limit. Vertex count: [VERTEX_COUNT]</string>
   <string name="TextureFound">Found texture: [TEXTURE_NAME] for material: [MATERIAL_NAME]</string>
   <string name="IgnoredExtension">Model uses unsupported extension: [EXT], related material properties are ignored</string>
@@ -74,6 +75,8 @@
   <string name="FailedToCreateTempFile">Failed to create temporary file for embedded [TEXTURE_TYPE] texture [TEXTURE_INDEX]: [TEMP_FILE]</string>
   <string name="SkinJointsOverLimit">Skin [SKIN_INDEX] defines [JOINT_COUNT] compatible joints, maximum is: [MAX]. Unused joints will be stripped on per model basis.</string>
   <string name="ModelTooManyJoint">Model [MODEL_NAME] uses [JOINT_COUNT], maximum: [MAX], upload might fail</string>
+  <string name="ParsingErrorMissingBuffer">Buffer is either missing or empty [BUFFER_NAME].</string>
+  <string name="ParsingErrorMissingBufferBin">Buffer is either missing or empty. Check presence of [BUFFER_URI] file.</string>
 
   <panel
     follows="top|left"
@@ -1720,7 +1723,6 @@ Analysed:
    height="408"/>
   <panel
     follows="right|bottom"
-    can_resize="false"
     height="140"
     layout="topleft"
     name="right_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 6633e25099..84252fe32c 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -54,6 +54,38 @@
                   label="jitter"
                   decimal_digits="1"
                   stat="frametimejitter"/>
+          <stat_bar name="framet_cumulative"
+                    label="jitter cumulative"
+                    decimal_digits="1"
+                    stat="frametimejitcumulative"/>
+          <stat_bar name="framet_jitter_99th"
+                    label="jitter 99th percentile"
+                    decimal_digits="1"
+                    stat="frametimejitter99"/>
+          <stat_bar name="framet_jitter_95th"
+                    label="jitter 95th percentile"
+                    decimal_digits="1"
+                    stat="frametimejitter95"/>
+          <stat_bar name="framet_jitter_stddev"
+                    label="frametime jitter standard deviation"
+                    decimal_digits="1"
+                    stat="frametimejitterstddev"/>
+          <stat_bar name="framet_99th"
+                    label="frametime 99th percentile"
+                    decimal_digits="1"
+                    stat="frametime99"/>
+          <stat_bar name="framet_95th"
+                    label="frametime 95th percentile"
+                    decimal_digits="1"
+                    stat="frametime95"/>
+          <stat_bar name="framet_stddev"
+                    label="frametime standard deviation"
+                    decimal_digits="1"
+                    stat="frametimestddev"/>
+          <stat_bar name="framet_events"
+                    label="frametime events"
+                    decimal_digits="1"
+                    stat="frametimeevents"/>
         <stat_bar name="bandwidth"
                   label="UDP Data Received"
                   stat="activemessagedatareceived"
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 08cc9ae19e..7d094ec613 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -455,7 +455,7 @@
 
     <panel
      follows="right|top|bottom"
-	 height="330"
+	 height="235"
 	 top_pad="0"
 	 width="238"
 	 name="layout_panel_4">
@@ -532,9 +532,9 @@
      width="16" />
     <search_editor
      follows="top|right"
-  search_button_visible="false"
+     search_button_visible="false"
      height="22"
-  text_readonly_color="DkGray"
+     text_readonly_color="DkGray"
      label="Regions by Name"
      layout="topleft"
      top_delta="-2"
@@ -542,10 +542,7 @@
      name="location"
      select_on_focus="true"
      tool_tip="Type the name of a region"
-     width="152">
-               <search_editor.commit_callback
-                function="WMap.Location" />
-  </search_editor>
+     width="152"/>
    <button
      follows="top|right"
      height="23"
@@ -594,6 +591,13 @@
 		<scroll_list.commit_callback
 		function="WMap.SearchResult" />
     </scroll_list>
+    </panel>
+    <panel
+     follows="right|bottom"
+	 height="95"
+	 top_pad="0"
+	 width="238"
+	 name="layout_panel_7">
       <text
       type="string"
       length="1"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index ec44cc9005..fa70ebe578 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -62,20 +62,9 @@
      name="mute_when_minimized"
 	   top_delta="3"
      left_pad="5"
-     width="20" />
-     <!-- *HACK 
-     	After storm-1109 will be fixed: instead of using this text_box, word_wrap should be applied for "mute_when_minimized" check_box's label.-->
-     <text
-      follows="top|left"
-      height="15"
-      layout="topleft"
-      left_pad="0"
-      name="mute_chb_label"
-      top_delta="-1"
-      width="150"
-      wrap="true">
-      Mute when minimized
-     </text>
+     width="20"
+     label="Mute when minimized"
+     word_wrap="true"/>
 	<slider
 		control_name="AudioLevelUI"
 		disabled_control="MuteAudio"
@@ -321,66 +310,45 @@
 		left_pad="5"
 		name="enable_voice_check"
 		width="110"/>
-	<!-- -->
   <text
    type="string"
    length="1"
    follows="left|top"
    layout="topleft"
    left="23"
-   top_delta="22"
+   top_delta="25"
    name="Listen media from"
    height="15"
-   word_wrap="true"
-   width="112">
-      Hear media and sounds from:
+   width="165"
+   halign="right">
+      Hear media and sounds from
   </text>
-  <radio_group
+  <combo_box
    control_name="MediaSoundsEarLocation"
    follows="left|top"
-   top_delta="-6"
    layout="topleft"
-   left_pad="10"
-   width="360"
-   height="40"
-   name="media_ear_location">
-      <radio_item
-       height="19"
-       label="Camera position"
-       follows="left|top"
-       layout="topleft"
-       name="0"
-       width="200"/>
-      <radio_item
-       height="19"
-       follows="left|top"
-       label="Avatar position"
-       layout="topleft"
-       left_delta="0"
-       name="1"
-       top_delta ="18"
-       width="200" />
-  </radio_group>  
- 	<check_box
-    name="media_show_on_others_btn"
-    control_name="MediaShowOnOthers"
-    value="true"
-    follows="left|top"
-    layout="topleft" 
-    height="15"
-    top_pad="8"
-    tool_tip="Uncheck this to hide media attached to other avatars nearby"
-    label="Play media attached to other avatars"
-    left="20"
-    width="230"/>
+   left_pad="5"
+   width="130"
+   height="23"
+   top_delta="-4"
+   name="media_ear_location_combo">
+   <item
+      label="Camera position"
+      name="camera_position"
+      value="0" />
+   <item
+      label="Avatar position"
+      name="avatar_position"
+      value="1" />
+</combo_box>
   <text
    follows="left|top"
    layout="topleft"
    height="15"
    left="23"
-   top_pad="8"
-   width="120"
-   name="media_autoplay_label">
+   width="165"
+   name="media_autoplay_label"
+   halign="right">
     Auto-play media
   </text>
   <combo_box
@@ -389,10 +357,10 @@
         follows="left|top"
         layout="topleft"
         height="23"
-        left_pad="-15"
+        left_delta="170"
         top_delta="-4"
         name="media_auto_play_combo"
-        width="115">
+        width="130">
     <item
         label="Never"
         name="autoplay_disabled"
@@ -433,23 +401,106 @@
    name="stream_notification_channel"
    top_pad="-15"
    width="170" />
+    <text
+        follows="left|top"
+        layout="topleft"
+        height="15"
+        left="23"
+        width="165"
+        name="media_firstinteract_label"
+        halign="right">
+            Media first-interact
+    </text>
+    <combo_box
+    control_name="MediaFirstClickInteract"
+    enabled_control="AudioStreamingMedia"
+    follows="left|top"
+    layout="topleft"
+    height="23"
+    left_delta="170"
+    top_delta="-4"
+    width="130"
+    name="media_first_interact_combo"
+    tool_tip="This setting controls which media (once loaded) does not require a first click to focus before interaction can begin. This allows clicks to be passed directly to media bypassing the focus click requirement. Each option also inherits the previous ones.">
+        <item
+            label="Disabled"
+            name="media_first_click_none"
+            value="0"/>
+        <item
+            label="Worn HUDs only"
+            name="media_first_click_hud"
+            value="1"/>
+        <item
+            label="Owned objects"
+            name="media_first_click_own"
+            value="3"/>
+        <item
+            label="Friends' objects"
+            name="media_first_click_friend"
+            value="11"/>
+        <item
+            label="Group objects"
+            name="media_first_click_group"
+            value="15"/>
+        <item
+            label="Landowner objects"
+            name="media_first_click_land"
+            value="31"/>
+        <item
+            label="Anyone's objects"
+            name="media_first_interact_any"
+            value="1073741823"/>
+        <item
+            label="All MOAP"
+            name="media_first_click_all"
+            value="2147483647"/>
+    </combo_box>
+   <check_box
+    name="media_show_on_others_btn"
+    control_name="MediaShowOnOthers"
+    enabled_control="AudioStreamingMedia"
+    value="true"
+    follows="left|top"
+    tool_tip="Uncheck this to hide media attached to other avatars nearby"
+    label="Play media attached to other avatars"
+    left="23"
+    width="15"
+    top_delta="30"
+    height="15"/>
+  <check_box
+    name="media_huds_autoplay"
+    control_name="MediaAutoPlayHuds"
+    enabled_control="AudioStreamingMedia"
+    value="true"
+    follows="left|top"
+    layout="topleft"
+    tool_tip="Uncheck this to make HUDs follow the standard media auto-play setting"
+    label="Auto-play media attached to your HUD"
+    left="260"
+    top_pad="-15"
+    width="15"
+    height="15"/>
   <text
    layout="topleft"
+   follows="left"
    height="15"
-   left="260"
-   top_pad="-18"
-   width="100"
-   name="noise_suppression_label">
-     Noise Suppression
+   width="165"
+   name="noise_suppression_label"
+   left="23"
+   top_delta="22"
+   halign="right">
+     Microphone Noise Suppression
   </text>
   <combo_box
    control_name="VoiceNoiseSuppressionLevel"
+   enabled_control="EnableVoiceChat"
+   follows="left|top"
    layout="topleft"
+   left_delta="170"
+   top_delta="-6"
+   width="130"
    height="23"
-   left_pad="10"
-   top_pad="-20"
-   name="noise_suppression_combo"
-   width="80">
+   name="noise_suppression_combo">
     <item
      label="Off"
      name="noise_suppression_none"
@@ -479,48 +530,44 @@
    left="23"
    top_delta="30"
    name="Listen from"
-   width="112">
-     Hear voice from:
+   width="165"
+   height="15"
+   halign="right">
+     Hear voice from
   </text>
-  <radio_group
+  <combo_box
    enabled_control="EnableVoiceChat"
    control_name="VoiceEarLocation"
    follows="left|top"
    layout="topleft"
-   left_pad="10"
+   left_delta="170"
    top_delta="-6"
-   width="360"
-   height="40"
-   name="ear_location">
-   <radio_item
-    height="19"
-    label="Camera position"
-    follows="left|top"
-    layout="topleft"
-    name="0"
-    width="200"/>
-   <radio_item
-    height="19"
-    follows="left|top"
-    label="Avatar position"
-    layout="topleft"
-    left_delta="0"
-    name="1"
-    top_delta ="18" 
-    width="200" />
-  </radio_group>
+   width="130"
+   height="23"
+   name="ear_location_combo">
+   <item
+      label="Camera position"
+      name="camera_position"
+      value="0" />
+   <item
+      label="Avatar position"
+      name="avatar_position"
+      value="1" />
+</combo_box>
   <check_box
    control_name="LipSyncEnabled"
+   enabled_control="EnableVoiceChat"
    follows="left|top"
    height="15"
    label="Move avatar lips when speaking"
    layout="topleft"
    left="20"
    name="enable_lip_sync"
-   top_pad="10" 
+   top_pad="8"
    width="237"/>
   <check_box
    control_name="VoiceEchoCancellation"
+   enabled_control="EnableVoiceChat"
    height="15"
    tool_tip="Check to enable voice echo cancellation"
    label="Echo Cancellation"
@@ -543,6 +590,7 @@
    top_pad="5"/>
   <check_box
    control_name="VoiceAutomaticGainControl"
+   enabled_control="EnableVoiceChat"
    height="15"
    tool_tip="Check to enable automatic gain control"
    label="Automatic Gain Control"
@@ -564,6 +612,7 @@
    left="20"/>
   <check_box
    control_name="VoiceVisualizerEnabled"
+   enabled_control="EnableVoiceChat"
    height="15"
    tool_tip="Check to show voice dot indicator above avatars"
    label="Show voice dot above avatars"
@@ -574,6 +623,7 @@
    width="200"/>
   <button
    control_name="ShowDeviceSettings"
+   enabled_control="EnableVoiceChat"
    follows="left|top"
    height="23"
    is_toggle="true"
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_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index b7db9dec96..1c70383bf9 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -986,6 +986,19 @@
              name="gltfTextureScaleV"
              width="265" />
             <spinner
+             decimal_digits="1"
+             follows="left|top"
+             height="19"
+             initial_value=""
+			 label="Repeats per meter"
+             layout="topleft"
+			 label_width="205"
+             left="10"
+             max_val="100"
+             min_val="-100"
+             name="gltfRptctrl"
+             width="265" />
+            <spinner
              follows="left|top"
              height="19"
              initial_value="0"