summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/widgets/chat_editor.xml
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-03-08 11:40:36 -0500
committerNat Goodspeed <nat@lindenlab.com>2024-03-08 11:40:36 -0500
commitc12a3c9f5bc085a67ef0fc2c764a9692bcab2b66 (patch)
treebad63257eacc0d137c5ea74b153cba600867e353 /indra/newview/skins/default/xui/en/widgets/chat_editor.xml
parentefdda0b93d2dbf28e7722150028476286f0ec623 (diff)
parentee8bc528bbf97ee8cc488651fb263b07b5c1c818 (diff)
Merge 'release/luau-scripting' into lua-leap for Emoji release.
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets/chat_editor.xml')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chat_editor.xml5
1 files changed, 4 insertions, 1 deletions
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"
+ />