Merge remote-tracking branch 'thickbrick/exp' into exp

Conflicts:
	linden/indra/newview/llpanelaudioprefs.cpp
	linden/indra/newview/llpanelaudioprefs.h
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml

7 files changed, 108 insertions, 59 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index c8aacba..453bf46 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -915,32 +915,18 @@ Only large parcels can be listed in search.
                                  right="-12"
                                  scale_image="true"
                                  width="70" />
-                        <check_box
-                                 bottom_delta="-22"
-                                 enabled="true"
-                                 follows="left|top"
-                                 font="SansSerifSmall"
-                                 height="16"
-                                 initial_value="false"
-                                 label="Hide URL"
-                                 left="80"
-                                 mouse_opaque="true"
-                                 name="hide_media_url"
-                                 radio_style="false"
-                                 tool_tip="Checking this option will hide the media URL from any non-authorized viewers of this parcel information. Note this is not available for HTML types."
-                                 width="150" />
                         <text
-                                 bottom_delta="0"
+                                 bottom_delta="-22"
                                  follows="right|top"
                                  font="SansSerifSmall"
-                                 halign="right"
+                                 halign="left"
                                  height="16"
                                  length="1"
                                  name="media_reset"
-                                 right="-164"
+                                 left="80"
                                  tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)"
                                  type="string"
-                                 width="185">
+                                 width="120">
                                 Return to Home URL in:
                         </text>
                         <spinner
@@ -948,14 +934,13 @@ Only large parcels can be listed in search.
                                  decimal_digits="0"
                                  enabled="false"
                                  follows="right|top"
-                                 halign="right"
                                  height="16"
                                  increment="1"
                                  initial_val="0"
                                  max_val="1024"
                                  min_val="0"
                                  name="media_reset_time"
-                                 right="-90"
+                                 left_delta="126"
                                  tool_tip="Amount of time until parcel reverts to default URL (0 for never return)"
                                  width="64" />
                         <text
@@ -964,12 +949,11 @@ Only large parcels can be listed in search.
                                  font="SansSerifSmall"
                                  halign="left"
                                  height="16"
-                                 left_delta="70"
+                                 left_delta="72"
                                  length="1"
                                  name="minutes"
-                                 right="-10"
                                  type="string">
-                                Minutes
+                                minutes
                         </text>
                         <text
                                  bottom_delta="-22"
@@ -1315,20 +1299,6 @@ Select the thumbnail to choose a different texture.
                                  name="music_url"
                                  right="-15"
                                  select_on_focus="true" />
-                        <check_box
-                                 bottom_delta="-25"
-                                 enabled="true"
-                                 follows="left|top"
-                                 font="SansSerifSmall"
-                                 height="16"
-                                 initial_value="false"
-                                 label="Hide URL"
-                                 left="80"
-                                 mouse_opaque="true"
-                                 name="hide_music_url"
-                                 radio_style="false"
-                                 tool_tip="Checking this option will hide the music URL from any non-authorized viewers of this parcel information."
-                                 width="150" />
                         <text
                                  bottom_delta="-65"
                                  follows="left|top"
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 9b7355c..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,48 +27,68 @@
         <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">
-                <column name="whitelist_col" label="Allowed domains/objects" dynamicwidth="true" />
+         bottom_delta="-200" left="15" height="200" width="280">
+                <column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
         </scroll_list>
 
         <scroll_list name="blacklist_list" follows="top|bottom|right"
          background_visible="true" mouse_opaque="true"
          multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
          bottom_delta="0" right="-15" height="200" width="280">
-                <column name="blacklist_col" label="Blocked domains/objects" dynamicwidth="true" />
+                <column name="blacklist_col" label="Blocked domains or server objects" dynamicwidth="true" />
         </scroll_list>
 
         <button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
+         tool_tip="Add a server to the whitelist"
          enabled="true" mouse_opaque="true" follows="bottom|left"
-         bottom_delta="-25" left="30" height="20" width="80" />
+         bottom_delta="-25" left="15" height="20" width="80" />
 
         <button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
+         tool_tip="Remove the selected server from the whitelist"
          enabled="true" mouse_opaque="true" follows="bottom|left"
-         bottom_delta="0" left_delta="100" height="20" width="80" />
+         bottom_delta="0" left="100" height="20" width="80" />
 
         <button name="clear_lists" font="SansSerif" label="Clear lists" halign="center"
-         enabled="true" mouse_opaque="true" follows="bottom|left|right"
-         bottom_delta="0" left_delta="110" height="20" width="120" />
+         tool_tip="Clear all lists"
+         enabled="true" mouse_opaque="true" follows="bottom|left"
+         bottom_delta="0" left="205" height="20" width="90" />
+
+        <button name="show_ips" font="SansSerif" label="Show IPs" halign="center"
+         tool_tip="Show the IP associated with each domain name (makes the viewer pause while the list is refreshed, because of DNS lookups)"
+         enabled="true" mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-205" height="20" width="90" />
 
         <button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
+         tool_tip="Add a server to the blacklist"
          enabled="true" mouse_opaque="true" follows="bottom|right"
-         bottom_delta="0" right="-130" height="20" width="80" />
+         bottom_delta="0" right="-100" height="20" width="80" />
 
         <button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
+         tool_tip="Remove the selected server from the blacklist"
          enabled="true" mouse_opaque="true" follows="bottom|right"
-         bottom_delta="0" right="-30" height="20" width="80" />
+         bottom_delta="0" right="-15" height="20" width="80" />
 
-        <text name="add_text" font="SansSerif" mouse_opaque="true" enabled="true"
-         bottom_delta="-25" left="20" height="20" width="500" follows="left|right|bottom">
+        <text name="add_text" font="SansSerif" mouse_opaque="true"
+         bottom_delta="-25" left="20" height="20" width="450" follows="left|right|bottom">
                 New domain:
         </text>
 
+        <check_box name="match_ip" label="Add/remove matching IP" initial_value="true"
+         tool_tip="Add or remove any IP associated with the added or removed domain name"
+         font="SansSerifSmall" mouse_opaque="true" radio_style="false"
+         bottom_delta="2" right="-95" height="16" width="70" follows="right|bottom" />
+
         <line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
+         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="-20"     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="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
+        <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="-95" height="20" width="80"/>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
index e95b371..f0ba830 100755
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
@@ -431,6 +431,17 @@
                         media_plugin_gstreamer
                 </impl>
         </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
         <mimetype menu="1" name="video/quicktime">
                 <label name="video/quicktime_label">
                         Movie (QuickTime)
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
index 7931e55..e1751eb 100755
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
@@ -431,6 +431,17 @@
                         media_plugin_quicktime
                 </impl>
         </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
+        </mimetype>
         <mimetype menu="1" name="video/quicktime">
                 <label name="video/quicktime_label">
                         Movie (QuickTime)
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
index 5ee4ed0..26491e0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -428,8 +428,19 @@
                         movie
                 </widgettype>
                 <impl>
-      media_plugin_quicktime
-    </impl>
+                        media_plugin_quicktime
+                </impl>
+        </mimetype>
+        <mimetype name="video/x-m4v">
+                <label name="video/m4v_label">
+                        Movie (M4V)
+                </label>
+                <widgettype>
+                        movie
+                </widgettype>
+                <impl>
+                        media_plugin_gstreamer
+                </impl>
         </mimetype>
         <mimetype menu="1" name="video/quicktime">
                 <label name="video/quicktime_label">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index eb8860d..306e3b8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7343,11 +7343,15 @@ The Second Life Terms of Service do not allow you to opt out. By logging in to S
    icon="alert.tga"
    name="MediaAlert"
    type="alert">
-The owner of this parcel has requested [TYPE] URL pertaining to the following domain or scripted object to be loaded by your viewer[WARNING]:
+The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
+
+[URL]
+
+You may choose to allow or deny the corresponding domain or in-world scripted object server:
 
 [DOMAIN]
 
-"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever to the above domain or scripted object.
+"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
    <form name="form">
     <button
          index="0"
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 1f208e8..355d7e8 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:
@@ -47,7 +47,16 @@
              initial_value="true" label="Media helper widget" left="162"
              mouse_opaque="true" name="media_helper_widget" 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" />