diff options
| author | Richard Linden <none@none> | 2010-09-16 16:29:53 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 16:29:53 -0700 |
| commit | d2a0327b6e89ca678e50e58dd685ea80e4c51cb5 (patch) | |
| tree | 99a6b0958cbb10af7044e8f26f9253e87d89e9bb /indra/newview/skins/default/xui/en | |
| parent | b24071ca8936035ff42cb361e42cac63593f695e (diff) | |
popup blocking notifications now handled in all web_browser instances, not just llfloatermediabrowser
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 15 insertions, 74 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index c220124f46..1cb8613eb4 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -200,76 +200,6 @@ name="browser" top="0" width="540" /> - <layout_stack - name="notification_stack" - left="0" - top="0" - width="540" - bottom="-30" - follows="all" - mouse_opaque="false" - orientation="vertical"> - <layout_panel - height="30" - min_height="30" - layout="topleft" - name="notification_area" - visible="false" - user_resize="false" - background_visible="true" - bg_alpha_image="Yellow_Gradient" - auto_resize="false" - width="800"> - <layout_stack - top="0" - height="30" - width="800" - left="0" - follows="bottom|left|right" - orientation="horizontal"> - <layout_panel - height="30"> - <icon name="notification_icon" - left="5" - top="7" - width="16" - height="15"/> - <text left_pad="8" - top="10" - height="25" - width="400" - text_color="black" - font="SansSerifSmall" - font.style="BOLD" - name="notification_text" - value="Notification text here"/> - </layout_panel> - <layout_panel - height="30" - width="130" - auto_resize="false" - user_resize="false" - name="form_elements"/> - <layout_panel - height="30" - width="25" - auto_resize="false" - name="close_panel"> - <button left="5" - name="close_notification" - width="16" - height="16" - top="8" - image_color="DkGray_66" - image_unselected="Icon_Close_Foreground" - image_selected="Icon_Close_Press"/> - </layout_panel> - </layout_stack> - </layout_panel> - <layout_panel - mouse_opaque="false" - auto_resize="true"/> - </layout_stack> <button follows="bottom|left" height="20" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 59fcd3513e..a2a5015d06 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6461,14 +6461,13 @@ Mute everyone? <unique/> <form name="form"> <ignore name="ignore" - text="Enable all pop-ups"/> + control="MediaEnablePopups" + text="Enable all pop-ups"/> <button default="true" index="0" name="open" text="Open pop-up window"/> </form> - - </notification> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 2c6ceeef2e..879781f746 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -320,7 +320,19 @@ radio_style="false" width="400" top_pad="5"/> - + <check_box + top_delta="4" + enabled="true" + follows="left|top" + height="14" + initial_value="false" + control_name="MediaEnablePopups" + label="Enable media browser pop-ups" + left_delta="0" + mouse_opaque="true" + name="media_popup_enabled" + width="400" + top_pad="5"/> <check_box top_delta="4" enabled="true" |