diff options
4 files changed, 43 insertions, 39 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml index 61210135ee..3ce6841a3a 100644 --- a/indra/newview/skins/default/xui/en/floater_social.xml +++ b/indra/newview/skins/default/xui/en/floater_social.xml @@ -25,7 +25,7 @@ <panel filename="panel_social_status.xml" class="llsocialstatuspanel" - background_opaque="true" + follows="all" background_visible="true" bg_alpha_color="DkGray" bg_opaque_color="DkGray" 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 fc86349235..c15b2f02d4 100644 --- a/indra/newview/skins/default/xui/en/panel_social_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_social_photo.xml @@ -1,11 +1,11 @@ <panel - height="430" + height="395" width="304" name="panel_social_photo"> <layout_stack layout="topleft" border_size="0" - height="422" + height="395" width="304" follows="all" orientation="vertical" @@ -20,9 +20,6 @@ height="295" width="286" left="7" - background_opaque="true" - background_visible="true" - bg_opaque_color="DkGray2" label="snapshot_panel" help_topic="snapshot_panel" name="snapshot_panel"> @@ -216,21 +213,10 @@ <layout_panel name="photo_button_panel" height="96"> - <panel - height="96" - top="0" - follows="all" - left="7" - right="-10" - background_opaque="true" - background_visible="true" - bg_opaque_color="DkGray" - label="button_container" - help_topic="button_container" - name="button_container"/> <button follows="left|top" top="15" + left="9" height="23" label="Post" name="post_btn" 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 30b48d9bb1..03068dddc6 100644 --- a/indra/newview/skins/default/xui/en/panel_social_place.xml +++ b/indra/newview/skins/default/xui/en/panel_social_place.xml @@ -1,11 +1,12 @@ <panel - height="430" - width="304" + height="395" + width="304" + layout="topleft" name="panel_social_place"> <layout_stack layout="topleft" border_size="0" - height="422" + height="395" follows="all" orientation="vertical" name="stack_place" @@ -20,13 +21,13 @@ height="16" left="9" name="place_caption_label" - top_pad="12" + top="1" type="string"> Say something about where you are: </text> <text_editor follows="top|left|right" - height="94" + height="80" right="-9" left="9" length="1" 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 ae199e7e38..f817a515e7 100644 --- a/indra/newview/skins/default/xui/en/panel_social_status.xml +++ b/indra/newview/skins/default/xui/en/panel_social_status.xml @@ -1,42 +1,57 @@ <panel - height="430" + height="395" width="304" + layout="topleft" name="panel_social_status"> - <text + <layout_stack + layout="topleft" + border_size="0" + height="395" + follows="all" + orientation="vertical" + name="stack_status" + top="8"> + <layout_panel + name="status_detail_panel" + height="255"> + <text length="1" follows="top|left|right" font="SansSerif" height="16" left="9" - name="caption_label" - top_pad="18" + name="status_caption_label" + top="1" type="string"> What's on your mind? - </text> - <text_editor - follows="left|top" + </text> + <text_editor + follows="left|top|right" height="80" - width="280" + right="-9" left="9" length="1" max_length="700" name="status_message" type="string" word_wrap="true"> - </text_editor> - <button - layout="topleft" + </text_editor> + </layout_panel> + <layout_panel + name="status_button_panel" + height="96"> + <button follows="left|top" + top="5" + left="9" height="23" label="Post" name="post_status_btn" - top_pad="18" width="100"> <button.commit_callback function="SocialSharing.SendStatus" /> - </button> - <button - layout="topleft" + </button> + <button follows="left|top" height="23" label="Cancel" @@ -46,5 +61,7 @@ width="100"> <button.commit_callback function="SocialSharing.Cancel" /> - </button> + </button> + </layout_panel> + </layout_stack> </panel>
\ No newline at end of file |