summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-09-16 16:29:53 -0700
committerRichard Linden <none@none>2010-09-16 16:29:53 -0700
commitd2a0327b6e89ca678e50e58dd685ea80e4c51cb5 (patch)
tree99a6b0958cbb10af7044e8f26f9253e87d89e9bb /indra/newview/skins/default/xui/en/panel_preferences_setup.xml
parentb24071ca8936035ff42cb361e42cac63593f695e (diff)
popup blocking notifications now handled in all web_browser instances, not just llfloatermediabrowser
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_setup.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_setup.xml14
1 files changed, 13 insertions, 1 deletions
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"