diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-04-14 07:44:56 +0200 |
|---|---|---|
| committer | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-04-14 17:27:30 +0200 |
| commit | ff7ebf08922293c1623b7bdb8c9923c14fc9db48 (patch) | |
| tree | 0ea63b12ec8cbd8d495c85c141fc783306d7dde1 /indra/newview/skins/default/xui | |
| parent | 638a45cbb1aeb228a0cf910571f1af8759c003a9 (diff) | |
SL-19575 Create emoji gallery access icon
Diffstat (limited to 'indra/newview/skins/default/xui')
3 files changed, 57 insertions, 6 deletions
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..a3e504cc31 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + name="emojipicker" + title="CHOOSE EMOJI" + help_topic="emojipicker" + positioning="cascading" + legacy_header_height="10" + can_resize="false" + layout="topleft" + height="419" + width="200"> + <panel + label="Emojis" + name="EmojiPanel" + help_topic="emojipicker" + layout="topleft" + top="4" + left="2" + height="410" + width="196"> + <scroll_list + draw_heading="true" + heading_height="28" + follows="all" + layout="topleft" + name="Emojis" + sort_column="0" + height="410"> + <columns + label="Look" + name="look" + width="40" /> + <columns + label="Name" + name="name" + width="150" /> + </scroll_list> + </panel> +</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..1592352d1b 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -297,8 +297,20 @@ tab_group="3" bottom="-8" left_pad="5" - right="-5" + right="-30" wrap="true" /> + <button + follows="right|bottom" + bottom="-7" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Emoji_Picker_Icon" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + right="-1" + name="emoji_panel_btn" + tool_tip="Shows/hides emoji panel" + width="25"/> </layout_panel> <layout_panel auto_resize="false" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 2fd2028c6b..5687fe55a5 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -485,9 +485,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> @@ -502,14 +502,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> |