diff options
| author | McCabe Maxsted | 2010-05-12 05:24:29 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:05:25 -0500 |
| commit | 2c77f8d61876b9d36ad63620da0bf34bcd428450 (patch) | |
| tree | e471f949dd7999722c1314e2873a050bae834f8c /linden/indra/newview/skins/default | |
| parent | Changed water preset loading from LL_INFOS to LL_DEBUGS to reduce log spam (diff) | |
| download | meta-impy-2c77f8d61876b9d36ad63620da0bf34bcd428450.zip meta-impy-2c77f8d61876b9d36ad63620da0bf34bcd428450.tar.gz meta-impy-2c77f8d61876b9d36ad63620da0bf34bcd428450.tar.bz2 meta-impy-2c77f8d61876b9d36ad63620da0bf34bcd428450.tar.xz | |
Added brandable buy currency button in the status bar (#273). Effectively reverts ad408085 and 2cb8d8b5
Diffstat (limited to 'linden/indra/newview/skins/default')
| -rw-r--r-- | linden/indra/newview/skins/default/textures/textures.xml | 2 | ||||
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml index 0a3aee7..611ad46 100644 --- a/linden/indra/newview/skins/default/textures/textures.xml +++ b/linden/indra/newview/skins/default/textures/textures.xml | |||
| @@ -204,8 +204,6 @@ | |||
| 204 | 204 | ||
| 205 | <texture name="status_no_build.tga"/> | 205 | <texture name="status_no_build.tga"/> |
| 206 | <texture name="status_voice.tga"/> | 206 | <texture name="status_voice.tga"/> |
| 207 | <texture name="status_buy_currency.tga"/> | ||
| 208 | <texture name="status_buy_currency_pressed.tga"/> | ||
| 209 | <texture name="status_buy_land.tga"/> | 207 | <texture name="status_buy_land.tga"/> |
| 210 | <texture name="status_buy_land_pressed.tga"/> | 208 | <texture name="status_buy_land_pressed.tga"/> |
| 211 | <texture name="status_no_fly.tga"/> | 209 | <texture name="status_no_fly.tga"/> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml index 63d2ca3..5a40a3d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml | |||
| @@ -20,12 +20,12 @@ | |||
| 20 | v_pad="2" width="76"> | 20 | v_pad="2" width="76"> |
| 21 | Loading... | 21 | Loading... |
| 22 | </text> | 22 | </text> |
| 23 | <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerif" | 23 | <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerifSmall" |
| 24 | halign="center" height="16" | 24 | halign="center" height="18" |
| 25 | image_selected="status_buy_currency_pressed.tga" | 25 | image_selected="button_enabled_selected_32x128.tga" |
| 26 | image_unselected="status_buy_currency.tga" label="" label_selected="" | 26 | image_unselected="button_enabled_32x128.tga" label="[CURRENCY]" |
| 27 | left="-210" mouse_opaque="true" name="buycurrency" scale_image="true" | 27 | left="-210" mouse_opaque="true" name="buycurrency" scale_image="true" |
| 28 | tool_tip="Buy currency" width="16" /> | 28 | tool_tip="Buy currency" width="36" /> |
| 29 | <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 29 | <text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
| 30 | bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true" | 30 | bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true" |
| 31 | enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0" | 31 | enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0" |