Merge main into DRTVWR-600-maint-A

14 files changed, 296 insertions, 22 deletions

diff --git a/indra/newview/skins/default/xui/en/emoji_categories.xml b/indra/newview/skins/default/xui/en/emoji_categories.xml
new file mode 100644
index 0000000000..0315d0c43a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/emoji_categories.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
+  <array>
+    <map>
+      <key>Name</key>
+      <string>smileys and emotion</string>
+      <key>Category</key>
+      <string>smileys and emotion</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>people and body</string>
+      <key>Category</key>
+      <string>people and body</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>components</string>
+      <key>Category</key>
+      <string>components</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>animals and nature</string>
+      <key>Category</key>
+      <string>animals and nature</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>food and drink</string>
+      <key>Category</key>
+      <string>food and drink</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>travel and places</string>
+      <key>Category</key>
+      <string>travel and places</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>activities</string>
+      <key>Category</key>
+      <string>activities</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>objects</string>
+      <key>Category</key>
+      <string>objects</string>
+    </map>
+    <map>
+      <key>Name</key>
+      <string>symbols</string>
+      <key>Category</key>
+      <string>symbols</string>
+    </map>
+  </array>
+</llsd>
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
index b79c5d9a19..42c3e7e935 100644
--- a/indra/newview/skins/default/xui/en/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/en/floater_activeim.xml
@@ -23,7 +23,7 @@
 		<scrolling_panel_list
 			follows="left|right"
 			layout="topleft"
-      left="1"      
+			left="1"
 			name="chiclet_row_panel_list"
 			width="318"/>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
new file mode 100644
index 0000000000..d290d647e8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ name="emoji_complete"
+ single_instance="true"
+ layout="topleft"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
+ can_close="false"
+ can_dock="false"
+ can_drag_on_left="false"
+ can_minimize="false"
+ can_resize="false"
+ can_tear_off="false"
+ header_height="0"
+ legacy_header_height="0"
+ show_title="false"
+ width="240"
+ height="40"
+ >
+	<emoji_complete
+	 name="emoji_complete_ctrl"
+	 follows="top|left"
+	 layout="topleft"
+	 autosize="true"
+	 vertical="true"
+	 max_visible="7"
+	 padding="4"
+	 width="230"
+	 height="30"
+	 left="5"
+	 top="5"
+	 >
+	</emoji_complete>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
new file mode 100644
index 0000000000..d21f8c82bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    name="emojipicker"
+    title="CHOOSE EMOJI"
+    help_topic="emojipicker"
+    single_instance="true"
+    can_minimize="false"
+    can_tear_off="false"
+    can_resize="true"
+    auto_close="true"
+    layout="topleft"
+    min_width="250"
+    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"/>
+  <scroll_container
+      name="EmojiGridContainer"
+      layout="topleft"
+      follows="all"
+      ignore_arrow_keys="true"
+      top="25"
+      left="0"
+      height="275">
+    <scrolling_panel_list
+        name="EmojiGrid"
+        layout="topleft"
+        follows="top|left|right"
+        padding="4"
+        spacing="0"
+        top="0"
+        left="0"/>
+  </scroll_container>
+  <panel
+      name="Groups"
+      layout="topleft"
+      follows="top|left|right"
+      top="0"
+      left="0"
+      height="25">
+    <panel
+      name="Badge"
+      layout="bottomleft"
+      follows="bottom|left"
+      background_visible="true"
+      background_opaque="true"
+      bg_opaque_color="FrogGreen"
+      tab_stop="false"
+      bottom="0"
+      height="2"
+      width="20"
+      />
+  </panel>
+  <text
+      name="Dummy"
+      type="string"
+      layout="bottomleft"
+      follows="bottom|left|right"
+      halign="center"
+      valign="center"
+      bottom="14"
+      left="10"
+      height="25">No emoji selected</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index da84fbeea6..a6493c5e24 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -238,7 +238,7 @@
                 </layout_stack>
             </layout_panel>
             <layout_panel
-             height="35"
+             height="30"
              auto_resize="false"
              name="chat_layout_panel">
                 <layout_stack
@@ -249,7 +249,7 @@
                  name="input_panels"
                  top="0"
                  bottom="-1"
-                 left="0"
+                 left="1"
                  right="-1">
                     <layout_panel
                      name="input_editor_layout_panel">
@@ -260,7 +260,7 @@
                          default_icon_name="Generic_Person"
                          layout="topleft"
                          left="3"
-                         bottom="-9"
+                         bottom="-4"
                          visible="false"
                          width="20" />
                         <group_icon
@@ -270,7 +270,7 @@
                          default_icon_name="Generic_Group"
                          layout="topleft"
                          left="3"
-                         bottom="-9"
+                         bottom="-4"
                          visible="false"
                          width="20" />
                         <icon
@@ -279,7 +279,7 @@
                          image_name="Nearby_chat_icon"
                          layout="topleft"
                          left="3"
-                         bottom="-9"
+                         bottom="-4"
                          name="nearby_chat_icon"
                          visible="false"
                          width="20"/>
@@ -288,17 +288,31 @@
                          expand_lines_count="5"
                          follows="left|right|bottom"
                          font="SansSerifSmall"
-                         height="20"    
+                         height="20"
                          is_expandable="true"
                          text_tentative_color="TextFgTentativeColor"
+                         bg_writeable_color="ScriptBackground"
                          name="chat_editor"
                          max_length="1023"
                          spellcheck="true"
                          tab_group="3"
-                         bottom="-8"
+                         bottom="-3"
                          left_pad="5"
-                         right="-5"
+                         right="-30"
                          wrap="true" />
+                        <button
+                         name="emoji_recent_panel_toggle_btn"
+                         tool_tip="Shows/hides recent emojis"
+                         follows="right|bottom"
+                         font="EmojiLarge"
+                         image_hover_unselected="Toolbar_Middle_Over"
+                         image_selected="Toolbar_Middle_Selected"
+                         image_unselected="Toolbar_Middle_Off"
+                         image_overlay="Emoji_Picker_Icon"
+                         bottom="-2"
+                         right="-1"
+                         height="25"
+                         width="25"/>
                     </layout_panel>
                     <layout_panel
                      auto_resize="false"
@@ -319,6 +333,42 @@
                     </layout_panel>
                 </layout_stack>
             </layout_panel>
+            <layout_panel
+             name="emoji_recent_layout_panel"
+             height="30"
+             auto_resize="false">
+                <text
+                 name="emoji_recent_empty_text"
+                 follows="top|left|right"
+                 layout="topleft"
+                 auto_resize="false"
+                 h_pad="20"
+                 v_pad="10"
+                 top="0"
+                 left="1"
+                 right="-65"
+                 height="30"
+                >Recently used emojis will appear here</text>
+                <emoji_complete
+                 name="emoji_recent_icons_ctrl"
+                 follows="top|left|right"
+                 layout="topleft"
+                 max_visible="20"
+                 top="0"
+                 left="1"
+                 right="-65"
+                 height="30"/>
+                <button
+                 name="emoji_picker_show_btn"
+                 label="More"
+                 tool_tip="Shows/hides emoji picker"
+                 follows="right|bottom"
+                 layout="topleft"
+                 bottom="-5"
+                 right="-3"
+                 height="20"
+                 width="60"/>
+            </layout_panel>
         </layout_stack>
     </view>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
index dcbdfa8794..ac5467c036 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_notecard.xml
@@ -73,6 +73,8 @@
      spellcheck="true"
      tab_group="1"
      top="46"
+     use_color="true"
+     show_emoji_helper="true"
      width="392"
      word_wrap="true">
         Loading...
diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index d88c267a95..40045625fd 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -3,6 +3,7 @@
 
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSans.ttf</file>
+    <file functor="is_emoji">TwemojiSVG.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
       <file>MSGOTHIC.TTC</file>
@@ -69,6 +70,11 @@
     <file>DejaVuSans-BoldOblique.ttf</file>
   </font>
 
+  <font name="Emoji"
+	comment="Name of emoji font">
+    <file>TwemojiSVG.ttf</file>
+  </font>
+
   <font name="Monospace"
 	comment="Name of monospace font">
     <file>DejaVuSansMono.ttf</file>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 96fac1c6e8..40399b33ef 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -161,6 +161,32 @@
       <menu_item_separator />
       <menu
        create_jump_keys="true"
+       label="Fonts"
+       name="Fonts"
+       tear_off="true">
+        <menu_item_call
+         label="Show Font Test"
+         name="Show Font Test">
+          <menu_item_call.on_click
+           function="Floater.Show"
+           parameter="font_test" />
+        </menu_item_call>
+        <menu_item_separator />
+        <menu_item_call
+         label="Dump Fonts"
+         name="Dump Fonts">
+          <menu_item_call.on_click
+           function="Develop.Fonts.Dump" />
+        </menu_item_call>
+        <menu_item_call
+         label="Dump Font Textures"
+         name="Dump Font Textures">
+          <menu_item_call.on_click
+           function="Develop.Fonts.DumpTextures" />
+        </menu_item_call>
+      </menu>
+      <menu
+       create_jump_keys="true"
        label="UI Tests"
        name="UI Tests"
        tear_off="true">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 660f4b62c7..38763cd9a8 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3531,6 +3531,18 @@ function="World.EnvPreset"
              parameter="http://duckduckgo.com"/>
           </menu_item_call>
           <menu_item_call
+           label="Dump Fonts"
+           name="Dump Fonts">
+            <menu_item_call.on_click
+             function="Develop.Fonts.Dump" />
+          </menu_item_call>
+          <menu_item_call
+           label="Dump Font Textures"
+           name="Dump Font Textures">
+            <menu_item_call.on_click
+             function="Develop.Fonts.DumpTextures" />
+          </menu_item_call>
+          <menu_item_call
              label="Dump SelectMgr"
              name="Dump SelectMgr">
                 <menu_item_call.on_click
@@ -3599,6 +3611,14 @@ function="World.EnvPreset"
                  function="Advanced.ToggleDebugViews" />
             </menu_item_check>
             <menu_item_check
+             label="Debug Unicode"
+             name="Debug Unicode">
+                <menu_item_check.on_check
+                 function="Advanced.CheckDebugUnicode" />
+                <menu_item_check.on_click
+                 function="Advanced.ToggleDebugUnicode" />
+            </menu_item_check>
+            <menu_item_check
              label="Debug Name Tooltips"
              name="Debug Name Tooltips">
                 <menu_item_check.on_check
@@ -4405,7 +4425,7 @@ function="World.EnvPreset"
                     <menu_item_call.on_click
                      function="PromptShowURL"
                      name="PublicIssueTracker_url"
-                     parameter="WebLaunchPublicIssue,http://jira.secondlife.com" />
+                     parameter="WebLaunchPublicIssue,https://feedback.secondlife.com/" />
                 </menu_item_call>
                 <menu_item_call
                  label="Public Issue Tracker Help"
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 4b20afe0c4..b59d035e99 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -27,7 +27,7 @@
     left_delta="110"
     name="preset_text"
     top="5"
-    width="120">
+    width="320">
       (None)
   </text>
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5d33853adc..3fbb5bc7e8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -491,9 +491,9 @@ http://secondlife.com/support for help fixing this problem.
 	<!-- build floater -->
 	<string name="multiple_textures">Multiple</string>
 
-<string name="use_texture">Use texture</string>
-    <string name="manip_hint1">Move mouse cursor over ruler</string>
-    <string name="manip_hint2">to snap to grid</string>
+	<string name="use_texture">Use texture</string>
+	<string name="manip_hint1">Move mouse cursor over ruler</string>
+	<string name="manip_hint2">to snap to grid</string>
 
 	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
@@ -508,14 +508,14 @@ http://secondlife.com/support for help fixing this problem.
 
 	<!-- Chat -->
 	<string name="NearbyChatTitle">Nearby chat</string>
-  <string name="NearbyChatLabel">(Nearby chat)</string>
+	<string name="NearbyChatLabel">(Nearby chat)</string>
 	<string name="whisper">whispers:</string>
 	<string name="shout">shouts:</string>
 	<string name="ringing">Connecting to in-world Voice Chat...</string>
 	<string name="connected">Connected</string>
 	<string name="unavailable">Voice not available at your current location</string>
 	<string name="hang_up">Disconnected from in-world Voice Chat</string>
-  <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
+	<string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
 	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
 	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
 	<string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
index f9facb593a..c550f634e5 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chat_editor
   name="chat_editor"
-  show_context_menu="true"/>
+  show_context_menu="true"
+  show_emoji_helper="true"
+  use_color="true"
+  />
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
index c0a948931c..c4300c9350 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -10,11 +10,11 @@
   bottom_separator_pad="1"
   top_header_pad="12"
   bottom_header_pad="5"
-	max_length="2147483647"
-	track_bottom="true"
-	name="chat_history"
-	type="string"
-	word_wrap="true"
+  max_length="2147483647"
+  track_bottom="true"
+  name="chat_history"
+  type="string"
+  word_wrap="true"
   line_spacing.multiple="1.0" 
   font="SansSerif">
   <more_chat_text
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
new file mode 100644
index 0000000000..6cc8d7118f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<emoji_complete
+  autosize="false"
+  hover_image="ListItem_Over"
+  selected_image="ListItem_Select"
+  max_visible="7"
+  padding="8"
+  >
+</emoji_complete>