diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-01-25 18:07:43 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-01-25 18:07:43 -0500 |
| commit | 644d5a5a03134fec09107e7aebe3b091d768f180 (patch) | |
| tree | 0e9275283c86df2f4561870bac893b7f1be2859b | |
| parent | e4dc4b9a72637cf536545cfa44f3384e55c4f460 (diff) | |
| parent | 9e83fb1f418f17fb92638d2ff75f71e96b5670bd (diff) | |
Automated merge with ssh://hg.lindenlab.com/james/gooey/
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_status_bar.xml | 17 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/menu_item.xml | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 7a6089c74e..5754f67045 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -49,7 +49,7 @@ image_unselected="spacer35.tga" image_pressed="spacer35.tga" height="16" - right="-228" + right="-204" label_shadow="false" name="buycurrency" tool_tip="My Balance" @@ -69,15 +69,16 @@ left_pad="0" label_shadow="false" name="buyL" - pad_right="20px" + pad_right="20" + pad_bottom="2" tool_tip="Click to buy more L$" top="2" - width="100" /> + width="71" /> <text type="string" font="SansSerifSmall" text_readonly_color="TimeTextColor" - follows="right|bottom" + follows="right|top" halign="right" height="16" top="5" @@ -85,11 +86,11 @@ left_pad="0" name="TimeText" tool_tip="Current time (Pacific)" - width="85"> - 12:00 AM + width="89"> + 24:00 AM PST </text> <button - follows="right|bottom" + follows="right|top" height="15" image_selected="AudioMute_Off" image_pressed="Audio_Press" @@ -101,7 +102,7 @@ tool_tip="Global Volume Control" width="16" /> <text - follows="right|bottom" + follows="right|top" halign="center" height="12" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/widgets/menu_item.xml b/indra/newview/skins/default/xui/en/widgets/menu_item.xml index c65244ae22..563f3dc5c2 100644 --- a/indra/newview/skins/default/xui/en/widgets/menu_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/menu_item.xml @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Use this for the top-level menu styling --> -<menu_item font="SansSerif" /> +<menu_item font="SansSerifSmall" /> |