diff options
| author | Jonathan Wolk <jwolk@lindenlab.com> | 2010-05-26 15:58:39 -0700 |
|---|---|---|
| committer | Jonathan Wolk <jwolk@lindenlab.com> | 2010-05-26 15:58:39 -0700 |
| commit | c888ddc847d88be12c8c00f03285f8bdcdab387c (patch) | |
| tree | e8e6347985532d997f53686ac670791df53b9c60 /indra/newview | |
| parent | f45f87e07df963f5d3629649f1416cd4a58dba89 (diff) | |
| parent | 94dd5b68b992719562cba925ef803cd36ef2efc4 (diff) | |
Merge remote heads since last local commit.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_status_bar.xml | 3 |
1 files changed, 3 insertions, 0 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 e0c9c49a23..008aa1acc0 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -44,6 +44,7 @@ <button auto_resize="true" halign="center" + enabled="false" font="SansSerifSmall" follows="right|top" image_overlay="" @@ -54,6 +55,8 @@ right="-275" label_shadow="false" name="buycurrency" + label_color_disabled="ButtonLabelColor" + image_color_disabled="White" tool_tip="My Balance" pad_left="12" pad_right="12" |