diff options
| author | David Walter Seikel | 2013-09-01 03:20:28 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-09-01 03:20:28 +1000 |
| commit | 2eb0e429d8c8dcc095aff7e703a9a3249c345628 (patch) | |
| tree | 405c34a2f594c5d940b290579166b9e95349e418 /linden/indra/newview/skins | |
| parent | Merge remote-tracking branch 'imprudence/next' into next (diff) | |
| download | meta-impy-2eb0e429d8c8dcc095aff7e703a9a3249c345628.zip meta-impy-2eb0e429d8c8dcc095aff7e703a9a3249c345628.tar.gz meta-impy-2eb0e429d8c8dcc095aff7e703a9a3249c345628.tar.bz2 meta-impy-2eb0e429d8c8dcc095aff7e703a9a3249c345628.tar.xz | |
Merge post fixes so that Linux compiles.
Windows is being a pig, will take a while.
Diffstat (limited to 'linden/indra/newview/skins')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml index 7974d85..c00a86d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20" | 7 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20" |
| 8 | mouse_opaque="true" name="cache_label" v_pad="0" width="185"> | 8 | mouse_opaque="true" name="cache_label" v_pad="0" width="185"> |
| 9 | Cache Will Be Cleared After | 9 | Cache Will Be Cleared After |
| 10 | You Restart Imprudence | 10 | You Restart meta-impy |
| 11 | </text> | 11 | </text> |
| 12 | <check_box bottom_delta="-37" follows="left|top" font="SansSerifSmall" height="20" | 12 | <check_box bottom_delta="-37" follows="left|top" font="SansSerifSmall" height="20" |
| 13 | initial_value="false" label="Clear texture cache" left="10" | 13 | initial_value="false" label="Clear texture cache" left="10" |