diff options
author | James Cook <james@lindenlab.com> | 2009-12-01 14:59:56 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-01 14:59:56 -0800 |
commit | a63d01b8bcac2ee248e8011ae45988e94187f3aa (patch) | |
tree | 35a6705fbcfcc3afa50b9103c4b33615850f74ef /indra/newview/skins | |
parent | c109fa9ec657b60fd99f981b192ee23ebff229bd (diff) | |
parent | 52a6fd6b33b500f707cccaae06427d23396429d5 (diff) |
merge
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_aaa.xml | 81 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/location_input.xml | 19 |
2 files changed, 62 insertions, 38 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_aaa.xml b/indra/newview/skins/default/xui/en/floater_aaa.xml index 3f86080160..6598c95c0e 100644 --- a/indra/newview/skins/default/xui/en/floater_aaa.xml +++ b/indra/newview/skins/default/xui/en/floater_aaa.xml @@ -1,36 +1,53 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater - height="400" + legacy_header_height="18" + can_minimize="false" + can_tear_off="false" + can_resize="true" + can_drag_on_left="false" + can_close="true" + can_dock="true" + bevel_style="in" + height="300" layout="topleft" - name="floater_aaa" - can_resize="true" - width="500"> - <string name="bump_parabuild">1</string> - <text - bottom="390" - left="10" - name="right_aligned_text" - width="300" - halign="right" - top_pad="10"> - Right aligned text - </text> - <text - bottom="390" - left="10" - name="centered_text" - width="300" - halign="center" - top_pad="10"> - Centered text - </text> - <text - left="10" - name="left_aligned_text" - width="300" - halign="left" - top_pad="10"> - Left aligned text - </text> - + name="Test Floater" + save_rect="true" + title="TEST FLOATER" + save_dock_state="true" + save_visibility="true" + single_instance="true" + width="320"> + <chat_history + allow_html="true" + bg_readonly_color="ChatHistoryBgColor" + bg_writeable_color="ChatHistoryBgColor" + border_visible="true" + follows="all" + font="SansSerif" + left="1" + top="20" + layout="topleft" + height="260" + name="chat_history" + parse_highlights="true" + text_color="ChatHistoryTextColor" + text_readonly_color="ChatHistoryTextColor" + width="320"> +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. +Really long line that is long enough to wrap once with jyg descenders. + </chat_history> </floater> diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index ea78f6d0dd..d32952b04f 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -53,35 +53,40 @@ name="voice_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_VoiceNo" /> <fly_icon name="fly_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_FlyNo" /> <push_icon name="push_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_PushNo" /> <build_icon name="build_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_BuildNo" /> <scripts_icon name="scripts_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_ScriptsNo" /> <!-- NOTE: Placeholder icon, there is no dark grayscale version --> @@ -89,7 +94,8 @@ name="damage_icon" width="22" height="18" - top="21" + top="21" + follows="right|top" image_name="parcel_lght_Damage" /> <!-- Default text color is invisible on top of nav bar background --> @@ -98,6 +104,7 @@ width="35" height="18" top="16" + follows="right|top" halign="right" font="SansSerifSmall" text_color="TextFgColor" |