9 files changed, 232 insertions, 58 deletions
diff --git a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
index 9898149..2f6ccf7 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
@@ -1,14 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+                DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Unable to Connect</title>
+<title>Unable to Connect</title><style>
-<style>
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:85%;color:#e9f1f8;width:100%;padding:0px;margin:0px;}
-body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;}
 a {color:#93a9d5;}
 a:active {color:#50607C;text-decoration:underline;}
 a:hover {color:#ff7900;text-decoration:underline;}
-#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;}
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-80px;text-align:left;font-size:1.2em; color:#ccc;}
-#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;}
+#infobox #submitbtn {height:28px;width:127px;}
 #infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;}
 #infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;}
 #infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;}
@@ -17,16 +17,34 @@ a:hover {color:#ff7900;text-decoration:underline;}
 </head>
 <body>
 <div id="infobox">
-        <img src="../../unabletoconnect.png"><br/>
+      <table>
-                <p>
-                        This viewer can't establish a connection to the login server.
+      <tbody style="height: 100px; overflow: scroll">
-                </p>
+        <tr>
-                <p>
+            This viewer can't establish a connection to the login screen of the grid you have chosen.
-                        Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that this viewer is permitted to access the network.
+        </tr>
-                </p>
+        <tr>
-                <div id="submitbtn">
+          <td>
-                        <input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
+            <img src="../../unabletoconnect.png"><br/>
-                </div>
-        </div>
+          <div id="submitbtn">
+            <input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
+           </div>
+          <td>
+            If you are used to see a loginscreen for that grid please
+         <ul>
+          <li>for OpenSimulator grids:  check if the loginuri of that grid is still valid.</li>
+          <li>for OpenSimulator and Second Life: check the grid status page of the grid, and</li>
+          <li>if the grid status page of the grid says online check your internet connection.
+                If your computer or network is protected by a firewall or proxy, make sure that 
+                meta-impy is permitted to access the network</li>
+         </ul>
+         </td>
+        </tr>
+       </tbody>
+      </table>
 </div>
-</body>
-\ No newline at end of file
+</body>
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_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 0275d9a..f25fd47 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -3,66 +3,91 @@
     can_resize="false" height="440" min_height="100" min_width="100"
     name="floater_about" rect_control="FloaterAboutRect"
     title="About grid viewer" width="470">
-        <text_editor bottom="-434" embedded_items="false"
+  <tab_container
-             follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
+                 follows="all"
-  max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
+                 bottom="10"
+                 left="10"
+                 height="405"
+                 width="450"
+                 name="about_tab"
+                 tab_position="top">
+    <panel
+      border="true"
+      height="386"
+      label="Version"
+      help_topic="about_support_tab"
+      name="support_panel">
+      <text_editor bottom="28" embedded_items="false"
+         follows="left|top|right|bottom" font="SansSerif" height="352" left="6"
+         max_length="65536" mouse_opaque="true" name="support_editor" width="423"
+         word_wrap="true" />
+      <button follows="left|top" label="Copy to Clipboard" name="copy_btn"
+         left="5" bottom="0" top_pad="5" height="20" width="180" />
+    </panel>
+    <panel
+        border="true"
+        label="Credits"
+        height="386"
+        help_topic="about_credits_tab"
+        name="credits_panel">
+        <text_editor bottom="6" embedded_items="false"
+             follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
+  max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
  word_wrap="true">
  Meta 7 is brought to you by Laurent, George, Melanie, Shaun, Dave, Kitto, Mike, Brandon, Erich, Daniel, Mark, Trinity, and Tom.
  http://www.meta7.com/
  This viewer is based on the Imprudence viewer.
  The Imprudence Viewer was rocked hard by:
-  Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. 
+  Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
  http://kokuaviewer.org/
-  
  Imprudence is so awesome thanks to contributions from many generous people:
-  
  For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar.
-  
  For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
  
  Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, meta 7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
  
  For a complete list of who did what, read the release notes!
+  Many thanks to the many residents in many grids who contributed towards this viewer in countless ways.
-  Many thanks to Linden Lab and the many residents in both grids who contributed towards this viewer in countless ways.
+        3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+        APR Copyright (C) 2000-2004 The Apache Software Foundation
-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-  APR Copyright (C) 2000-2004 The Apache Software Foundation
+        DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+        expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+        GL Copyright (C) 1999-2004 Brian Paul.
-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-  GL Copyright (C) 1999-2004 Brian Paul.
+        jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+        jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+        ogg/vorbis Copyright (C) 2001, Xiphophorus
-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-  ogg/vorbis Copyright (C) 2001, Xiphophorus
+        SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+        SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+        google-perftools Copyright (c) 2005, Google Inc.
-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+        Code from FAAD2 is copyright (c) Nero AG, www.nero.com
-  google-perftools Copyright (c) 2005, Google Inc.
-  Code from FAAD2 is copyright (c) Nero AG, www.nero.com
-  All rights reserved.  See LICENSE-libraries.txt for details.
+        All rights reserved.  See LICENSE-libraries.txt for details.
-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+        Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-  I live in the future, just waiting for the rest of you to catch up. -- onefang Rejected </text_editor>
+  I live in the future, just waiting for the rest of you to catch up. -- onefang Rejected
+      </text_editor>
-        <text_editor bottom_delta="174" embedded_items="false"
+    </panel>
-             follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
+  </tab_container>
-             max_length="65536" mouse_opaque="true" name="support_editor" width="458"
+  <string name="you_are_at">
-             word_wrap="true" />
-        <string name="you_are_at">
                You are at [POSITION]
        </string>
 </floater>
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_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index 6fc6c57..87907ec 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18">
+<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18" follows="left|top|right">
        <menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false">
                <menu_item_call label="Quit" name="Quit" shortcut="control|Q">
                        <on_click function="File.Quit" userdata="" />
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 97d339f..93ebd1c 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">
@@ -1343,6 +1348,18 @@
          <on_check function="Advanced.CheckInfoDisplay"
                    userdata="glow" />
        </menu_item_check>
+        <menu_item_check name="Raycasting" label="Raycasting">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="raycasting" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="raycasting" />
+        </menu_item_check>
+        <menu_item_check name="Sculpt" label="Sculpt">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="sculpt" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="sculpt" />
+        </menu_item_check>
        <menu_item_check name="Vectorize Perf Test"
                         label="Vectorize Perf Test">
          <on_click function="ToggleControl"
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 4cea9ce..320ed18 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7299,6 +7299,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
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index e64f6c7..fe17e7a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -22,6 +22,9 @@
  <string name="log_in_to_change">
    log in to change
  </string>
+  <string name="default_email_used">
+    using default address
+  </string>
  <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
             height="16" initial_value="false" label="Send IM to email ([EMAIL])"
             left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"