Fix 829: Several changes to media filter

- Adds a "less annoying" mode, which attempts to only filter scripted
  streaming events. On by default (should we change that?)
- Adds UI to enable and disable the media filter, both from the filter
  floater and from the preferences floater.
- Adds a button to launch the filter floater to prefences.
- Some UI tweaks to the filter floater.

2 files changed, 33 insertions, 8 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
index 5faaf1a..f0fb3a3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floatermediafilter" title="Media Filter" rect_control="MediaFilterRect"
  can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
- height="350" width="600" min_height="350" min_width="600">
+ height="410" width="600" min_height="350" min_width="600">
+
+        <check_box control_name="MediaEnableFilter" name="enable_mediafilter" label="Enable Media Filter"
+         initial_value="true" tool_tip="Enables filtering media URLs by domain names."
+         font="SansSerifSmall" mouse_opaque="true"
+         left="14" height="16" bottom_delta="-45" width="4500" follows="left|top" />
+
+        <check_box control_name="MediaFilterOnlyRemoteCommands" name="filter_only_remote"
+         label="Filter only when a script initiates the stream (less secure)" initial_value="false" 
+         tool_tip="This will prevent popups asking about URLs that are permanently set on a parcel. 
+Only scripted changes to the media URL and scripted requests to start playing a stream will be filtered."
+         font="SansSerifSmall" mouse_opaque="true"
+         left_delta="14" height="16" width="450" follows="left|top" />
+
         <text name="info1" font="SansSerif" mouse_opaque="true" halign="center"
-         bottom_delta="-45" left="20" height="20" width="560" follows="left|right|top">
+         bottom_delta="-40" left="20" height="20" width="560" follows="left|right|top">
                 Domains in bold are in the persistent list (i.e. they are whitelisted or blacklisted).
         </text>
         <text name="info2" font="SansSerif" mouse_opaque="true" halign="center"
@@ -14,7 +27,7 @@
         <scroll_list name="whitelist_list" follows="top|bottom|left"
          background_visible="true" mouse_opaque="true"
          multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
-         bottom_delta="-205" left="15" height="200" width="280">
+         bottom_delta="-200" left="15" height="200" width="280">
                 <column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
         </scroll_list>
 
@@ -69,10 +82,13 @@
          tool_tip="Enter the new URL, domain name, IP or scripted object HTTP server path here"
          select_all_on_focus_received="true" select_on_focus="true"
          bevel_style="in" border_style="line" border_thickness="1"
-         bottom_delta="-22"     right="-100" height="20" left="15" follows="left|bottom|right"/>
+         bottom_delta="-22"     right="-180" height="20" left="15" follows="left|bottom|right"/>
 
+        <button name="cancel_domain" font="SansSerif" label="Cancel" halign="center" enabled="false"
+         mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-15" height="20" width="80"/>
         <button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
          tool_tip="Add to the list"
          mouse_opaque="true" follows="bottom|right"
-         bottom_delta="0" right="-15" height="20" width="80"/>
+         bottom_delta="0" right="-95" height="20" width="80"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index c6bb938..3415b1b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -9,13 +9,13 @@
                 Volume:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-202" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
                 Streaming:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-285" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-315" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio:
@@ -42,7 +42,16 @@
              initial_value="true" label="Automatically play media" left="162"
              mouse_opaque="true" name="auto_streaming_video" radio_style="false"
              width="338" />
-        <check_box bottom_delta="-27" control_name="MuteWhenMinimized" enabled="true"
+        <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="true" label="Filter media URLs" left="142"
+             mouse_opaque="true" name="enable_media_filter" radio_style="false"
+             width="200" />
+        <button name="show_media_filter" font="SansSerif" label="Media Filter Settings" halign="center"
+             tool_tip="Edit settings and the blocked and allowed lists for the Media Filter."
+             enabled="false" mouse_opaque="true" follows="top|right"
+             bottom_delta="-2" right="-15" height="20" width="180" />
+        <check_box bottom_delta="-33" control_name="MuteWhenMinimized" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Mute audio when window minimized" left="142" mouse_opaque="true"
              name="mute_when_minimized" radio_style="false" width="215" />