summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-06-25 15:22:37 -0700
committerMerov Linden <merov@lindenlab.com>2012-06-25 15:22:37 -0700
commit94e6e4bd3d8260894a3d76e5101858cd1582be59 (patch)
tree79bb74ecfc8befc3aa0977a6fa2202acc0fd5d6d /indra/newview
parent41e965c12e29136d2b81a9b67d6b6c9af4fb2092 (diff)
parent9fc77dec8788944f93eda14567f9235f97637097 (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml39
1 files changed, 16 insertions, 23 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 0720a4b011..56e591e2bb 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -235,29 +235,22 @@
</layout_panel>
</layout_stack>
</panel>
- <panel width="225"
- height="31"
- left="4"
- name="bottom_panel"
- bottom="-1"
- follows="left|right|bottom"
- tab_group="1">
- <chat_editor
- bottom="0"
- expand_lines_count="5"
- follows="left|right|bottom"
- font="SansSerifSmall"
- visible="true"
- height="20"
- is_expandable="true"
- label="To"
- layout="bottomleft"
- name="chat_editor"
- tab_group="3"
- width="240"
- wrap="true">
- </chat_editor>
- </panel>
+ <chat_editor
+ bottom="0"
+ expand_lines_count="5"
+ follows="left|right|bottom"
+ font="SansSerifSmall"
+ visible="true"
+ height="20"
+ is_expandable="true"
+ label="To"
+ layout="bottomleft"
+ name="chat_editor"
+ max_length="1024"
+ tab_group="3"
+ width="240"
+ wrap="true">
+ </chat_editor>
</layout_panel>
</layout_stack>
</view>