diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-07-08 17:17:42 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-07-08 17:17:42 -0700 |
| commit | da2c2d9d23795ee7b9f2497180cdff91397aec53 (patch) | |
| tree | fac270ed4d9cc8923b484d240cefa9a52bcd6dba /indra | |
| parent | e6ac587f372559c4c84f8b1e4bc5ab94d9a665c3 (diff) | |
| parent | 13d165290d62a6bd2d9a1b09c952458e64bbb710 (diff) | |
Pull merge from lindenlab/viewer-fbc
Diffstat (limited to 'indra')
4 files changed, 13 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml index 781c48729c..0a7014c876 100644 --- a/indra/newview/skins/default/xui/en/floater_social.xml +++ b/indra/newview/skins/default/xui/en/floater_social.xml @@ -20,7 +20,7 @@ tab_height="30" tab_position="top" top="7" - height="395" + height="430" halign="center"> <panel filename="panel_social_status.xml" @@ -36,6 +36,9 @@ filename="panel_social_photo.xml" class="llsocialphotopanel" follows="all" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" label="PHOTO" help_topic="panel_social_photo" name="panel_social_photo"/> @@ -53,7 +56,8 @@ <panel name="connection_status_panel" follows="left|top" - height="26"> + height="26" + top_pad="-30"> <text name="connection_error_text" type="string" diff --git a/indra/newview/skins/default/xui/en/panel_social_photo.xml b/indra/newview/skins/default/xui/en/panel_social_photo.xml index 162884f01d..ddf2e5e613 100644 --- a/indra/newview/skins/default/xui/en/panel_social_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_social_photo.xml @@ -131,7 +131,7 @@ height="96"> <button follows="left|top" - top="15" + top="32" left="9" height="23" label="Post" @@ -153,4 +153,4 @@ </button> </layout_panel> </layout_stack> - </panel>
\ No newline at end of file + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_social_place.xml b/indra/newview/skins/default/xui/en/panel_social_place.xml index 03068dddc6..2c186fc52e 100644 --- a/indra/newview/skins/default/xui/en/panel_social_place.xml +++ b/indra/newview/skins/default/xui/en/panel_social_place.xml @@ -84,7 +84,7 @@ height="96"> <button follows="left|top" - top="5" + top="40" left="9" height="23" label="Post" @@ -106,4 +106,4 @@ </button> </layout_panel> </layout_stack> - </panel>
\ No newline at end of file + </panel> diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml index f817a515e7..c5059b679b 100644 --- a/indra/newview/skins/default/xui/en/panel_social_status.xml +++ b/indra/newview/skins/default/xui/en/panel_social_status.xml @@ -13,7 +13,7 @@ top="8"> <layout_panel name="status_detail_panel" - height="255"> + height="40"> <text length="1" follows="top|left|right" @@ -42,7 +42,7 @@ height="96"> <button follows="left|top" - top="5" + top="213" left="9" height="23" label="Post" @@ -64,4 +64,4 @@ </button> </layout_panel> </layout_stack> - </panel>
\ No newline at end of file + </panel> |