Sync media filter patch to Henri Beauchamp's MediaFilter_v4

Compared to v3, this adds resolving domains to IPs in order to list
them and match them against listed IPs. Also shows both the full stream
url and the munged domain that will be added to the lists.

2 files changed, 34 insertions, 13 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 9b7355c..5faaf1a 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
@@ -15,47 +15,64 @@
          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" />
+                <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="-100" height="20" left="15" follows="left|bottom|right"/>
 
         <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"/>
 </floater>
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 27f5529..aa4a1b5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7324,11 +7324,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"