diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-08-29 10:45:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-08-29 10:45:32 -0700 |
| commit | 01a154809d650f7905aaa208150a1070b19e5c2b (patch) | |
| tree | f0dda921e97830d68e41553137459a3dbcca07b6 /indra/newview/skins/default | |
| parent | ca7abc4c3be9310f4e5fec00b7d6ffadaba58ff0 (diff) | |
| parent | 051bc99573d7c571cea0e2e1df332c1e5e97ff19 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_conversation_preview.xml | 12 |
1 files changed, 11 insertions, 1 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 27b744aefb..c837a0ee57 100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_preview.xml @@ -3,7 +3,7 @@ legacy_header_height="18" can_resize="true" default_tab_group="1" - height="361" + height="391" layout="topleft" min_height="243" min_width="234" @@ -50,4 +50,14 @@ left="5" width="390"> </chat_history> + <button + follows="bottom|right" + height="22" + layout="topleft" + name="more_history" + label="More history..." + right="-15" + top_pad="5" + width="100"> + </button> </floater> |