Pull merge from lindenlab/viewer-fbc

meow-7.2.2
Merov Linden 2013-07-08 17:17:42 -07:00
commit da2c2d9d23
4 changed files with 13 additions and 9 deletions

View File

@ -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"

View File

@ -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>
</panel>

View File

@ -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>
</panel>

View File

@ -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>
</panel>