diff options
author | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
commit | fe518bde8e6db65d3d6b178c200410b1346639a4 (patch) | |
tree | d738e12f8391a675d36aae9d59ced8104846008c /indra/newview/skins/default/xui/en/widgets | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
parent | d9d46d908c0573dbcd45ec2a1bea56966823343b (diff) |
merge with release
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rwxr-xr-x | indra/newview/skins/default/xui/en/widgets/avatar_icon.xml | 12 | ||||
-rwxr-xr-x | indra/newview/skins/default/xui/en/widgets/floater.xml | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml index 4d69dda7eb..7f8fac04d0 100755 --- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<avatar_icon - name="avatar_icon" - default_icon_name="Generic_Person_Large" - use_draw_context_alpha="false"> -</avatar_icon> +<avatar_icon name="avatar_icon" + default_icon_name="Generic_Person_Large" + use_draw_context_alpha="false" + symbol_hpad = "2" + symbol_vpad = "1" + symbol_size = "5"/> + diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 97a5ae7d4e..807b67d112 100755 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -2,7 +2,6 @@ <!-- See also settings.xml UIFloater* settings for configuration --> <floater name="floater" - positioning="none" layout="topleft" bg_opaque_color="FloaterFocusBackgroundColor" bg_alpha_color="FloaterDefaultBackgroundColor" |