SL-19951 Organize emoji categories in groups

2 files changed, 81 insertions, 11 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_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index 2e153933c0..2a534b23b9 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -7,8 +7,9 @@
     legacy_header_height="0"
     can_resize="true"
     layout="topleft"
+    min_width="250"
     height="400"
-    width="200">
+    width="250">
   <line_editor
       name="Search"
       label="Type to search"
@@ -19,7 +20,7 @@
       bottom="14"
       left="34"
       height="29"
-      width="162" />
+      width="212" />
   <text
       name="Description"
       layout="bottomleft"
@@ -28,7 +29,7 @@
       bottom="14"
       left="42"
       height="29"
-      width="150" />
+      width="200" />
   <button
       name="PreviewEmoji"
       layout="bottomleft"
@@ -46,7 +47,7 @@
       top="25"
       left="0"
       height="330"
-      width="200">
+      width="250">
     <scrolling_panel_list
         name="EmojiGrid"
         layout="topleft"
@@ -55,16 +56,26 @@
         spacing="0"
         top="0"
         left="0"
-        width="200"/>
+        width="250"/>
   </scroll_container>
-  <combo_box
-      name="Category"
-      label="Choose a category"
+  <panel
+      name="Groups"
       layout="topleft"
       follows="top|left|right"
-      allow_text_entry="true"
       top="0"
-      left="2"
+      left="0"
       height="25"
-      width="196" />
+      width="250">
+    <panel
+      name="Badge"
+      layout="bottomleft"
+      follows="bottom|left"
+      background_visible="true"
+      background_opaque="true"
+      bg_opaque_color="FrogGreen"
+      bottom="0"
+      height="2"
+      width="20"
+      />
+  </panel>
 </floater>