diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-12 23:21:42 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-12 23:21:42 -0700 |
| commit | aa191cb98a80cd637b623f1dfb765374bf98dfa6 (patch) | |
| tree | 689e5282dd9fddfa5acce80ce0da1111ba467ecb /indra/newview/skins/default/xui | |
| parent | 5cad4b5768cccc8301da5e15dd09a0a4e68d4112 (diff) | |
| parent | 51725b3898df96aa5819d86d1e8e7c71b47304f2 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_conversation_preview.xml | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml index d74c2c252d..0e5af67f68 100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml @@ -14,41 +14,17 @@ name="Title"> CONVERSATION: [NAME] </floater.string> - <text - type="string" - length="1" - follows="left|top" - font="SansSerif" - height="19" - layout="topleft" - left="10" - name="desc txt" - top="22" - width="90"> - Description: - </text> - <line_editor - border_style="line" - border_thickness="1" - enabled="false" - follows="left|top|right" - font="SansSerif" - height="22" - layout="topleft" - left_pad="0" - max_length_bytes="127" - name="description" - width="296" /> <chat_history font="SansSerifSmall" follows="all" visible="true" - height="310" + height="330" name="chat_history" notify_unread_msg="false" parse_highlights="true" parse_urls="true" left="5" + top_pad="25" width="390"> </chat_history> <text @@ -63,6 +39,7 @@ width="35"> </text> <spinner + allow_digits_only="true" decimal_digits="0" follows="bottom|right" height="23" |