5 files changed, 118 insertions, 2 deletions

diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index 07dee37..fc7c204 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST>
+<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST]">
 
         <string name="pay group">
                 Gruppe bezahlen:
diff --git a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 565e6b8..6c2da13 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -6,7 +6,7 @@
         <text length="1" name="BalanceText" tool_tip="Kontostand" type="string">
                 Wird geladen...
         </text>
-        <button label="" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
+        <button label="[CURRENCY]" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
         <text length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)" type="string">
                 12:00
         </text>
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
new file mode 100644
index 0000000..9b7355c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -0,0 +1,61 @@
+<?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">
+        <text name="info1" font="SansSerif" mouse_opaque="true" halign="center"
+         bottom_delta="-45" 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"
+         bottom_delta="-20" left="20" height="20" width="560" follows="left|right|top">
+                Domains in italics are in the session list (i.e. they are temporarily allowed or denied).
+        </text>
+
+        <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" />
+        </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" />
+        </scroll_list>
+
+        <button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
+         enabled="true" mouse_opaque="true" follows="bottom|left"
+         bottom_delta="-25" left="30" height="20" width="80" />
+
+        <button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
+         enabled="true" mouse_opaque="true" follows="bottom|left"
+         bottom_delta="0" left_delta="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" />
+
+        <button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
+         enabled="true" mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-130" height="20" width="80" />
+
+        <button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
+         enabled="true" mouse_opaque="true" follows="bottom|right"
+         bottom_delta="0" right="-30" 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">
+                New domain:
+        </text>
+
+        <line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
+         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"/>
+
+        <button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
+         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/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 4bde0f0..5fbf337 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -277,6 +277,11 @@
       <on_click function="ShowAgentGroups"
                 userdata="agent" />
     </menu_item_call>
+    <menu_item_check bottom="-192" enabled="true" height="19" label="Media Filter" left="0"
+                     mouse_opaque="true" name="Media Filter" width="211">
+       <on_click function="ShowFloater" userdata="media filter" />
+       <on_check function="FloaterVisible" userdata="media filter" />
+    </menu_item_check>
     <menu_item_separator />
     <menu_item_call name="Preferences..." label="Preferences..."
                     shortcut="control|P">
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 47d3dbb..27f5529 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7320,6 +7320,56 @@ The Second Life Terms of Service do not allow you to opt out. By logging in to S
    notext="Cancel"/>
 </notification>
 
+  <notification
+   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]:
+
+[DOMAIN]
+
+"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever to the above domain or scripted object.
+   <form name="form">
+    <button
+         index="0"
+         name="Allow"
+         text="Allow"/>
+        <button
+         index="1"
+         name="Deny"
+         text="Deny"/>
+        <button
+         index="2"
+         name="Blacklist"
+         text="Blacklist"/>
+        <button
+         index="3"
+         name="Whitelist"
+         text="Whitelist"/>
+   </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="MediaListed"
+   type="alert">
+Media/audio URLs for [DOMAIN] now [LISTED]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="MediaBlocked"
+   type="notifytip">
+Media/audio URL blocked for [DOMAIN]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MediaFiltersCleared"
+   type="alertmodal">
+The media filters have been cleared
+  </notification>
+
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
   <notification