diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-26 17:15:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-26 17:15:48 -0700 |
| commit | e8ec428539d951bdd3a26623b1dc38c54a04753b (patch) | |
| tree | 125b780a9c8c3847f7b53925a242ede581fee6f5 /indra/newview/skins | |
| parent | c233f0c9494d7dddbd8baab0f87b0ad54f42b0f9 (diff) | |
| parent | abe106bd9c33fef12dcf4eacca228d5d669d9e34 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_im_session.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chat_editor.xml | 4 |
2 files changed, 5 insertions, 1 deletions
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 56e591e2bb..08bc46a506 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -246,7 +246,7 @@ label="To" layout="bottomleft" name="chat_editor" - max_length="1024" + max_length="1023" tab_group="3" width="240" wrap="true"> diff --git a/indra/newview/skins/default/xui/en/widgets/chat_editor.xml b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml new file mode 100644 index 0000000000..f9facb593a --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/chat_editor.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<chat_editor + name="chat_editor" + show_context_menu="true"/> |