diff options
| author | James Cook <james@lindenlab.com> | 2009-12-29 17:14:50 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-29 17:14:50 -0800 |
| commit | 180ffcf263b81173ae7dcac0ce9abdb10c621e46 (patch) | |
| tree | 04654bf2fdf90dcc5f3a1efdf801021b6075b343 /indra/newview/skins/default | |
| parent | b3d0c94ee0e79a6cd8ee594ec129b0215c56794a (diff) | |
| parent | 8e5b453ea05ca3d53997b1fc2f0f4fcf65de9857 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index 361f5a7bc8..d7f8114c34 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -18,6 +18,8 @@ left="0" name="favorites_bar_btn" tab_stop="false" + pad_right="10" + pad_left="10" top="0" use_ellipses="true" width="120" /> diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml index 552902d1d9..0d155fb01e 100644 --- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml @@ -64,7 +64,7 @@ height="16" layout="topleft" left_delta="-110" - name="dimensions" + name="aspect_ratio" top_pad="5" width="200"> Preview aspect ratio @@ -112,7 +112,7 @@ label="OK" layout="topleft" left="6" - name="keep" + name="Keep" top_pad="5" width="100" /> <button @@ -121,7 +121,7 @@ label="Cancel" layout="topleft" left_pad="5" - name="discard" + name="Discard" top_delta="0" width="100" /> <button diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 74265a51ca..4d814a4d52 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -149,7 +149,7 @@ <favorites_bar follows="left|right|top" - font="SansSerif" + font="SansSerifSmall" height="15" layout="topleft" left="0" |