diff options
author | Merov Linden <merov@lindenlab.com> | 2014-02-27 13:04:23 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-02-27 13:04:23 -0800 |
commit | 279e9b0743dfd86f9b40f693349aae9fc1268d35 (patch) | |
tree | 5bade6c6d943d07ffbf785d7ddd300e597c47a0e /indra/newview/skins/default/xui | |
parent | ed38a0aede09f42c4fe7eb4dd53ecd6490d12ca0 (diff) |
ACME-1327 : Implemented preview in all SL Share panels, switch ownership of preview to focused SL Share photo panel
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_facebook_photo.xml | 16 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_twitter_photo.xml | 16 |
2 files changed, 30 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml index 0cde43a20c..1d826fdbe1 100644 --- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml @@ -86,7 +86,7 @@ text_color="EmphasisColor" height="14" top_pad="-19" - left_pad="-20" + left_pad="-30" length="1" halign="center" name="working_lbl" @@ -96,6 +96,20 @@ width="150"> Refreshing... </text> + <button + follows="right|top" + height="23" + label="Preview" + left="200" + top_pad="-19" + name="big_preview_btn" + tool_tip="Click to toggle preview" + is_toggle="true" + visible="true" + width="100" > + <button.commit_callback + function="SocialSharing.BigPreview" /> + </button> <text length="1" follows="top|left|right" diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml index bcec09ebab..c2be56da21 100644 --- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml +++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml @@ -138,7 +138,7 @@ text_color="EmphasisColor" height="14" top_pad="-19" - left_pad="-20" + left_pad="-30" length="1" halign="center" name="working_lbl" @@ -148,6 +148,20 @@ width="150"> Refreshing... </text> + <button + follows="right|top" + height="23" + label="Preview" + left="200" + top_pad="-19" + name="big_preview_btn" + tool_tip="Click to toggle preview" + is_toggle="true" + visible="true" + width="100" > + <button.commit_callback + function="SocialSharing.BigPreview" /> + </button> </layout_panel> <layout_panel name="photo_button_panel" |