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

24 files changed, 1043 insertions, 33 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index dedced0..9a4e2ed 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -498,6 +498,7 @@ set(viewer_SOURCE_FILES
     rlvmultistringsearch.cpp
     rlvextensions.cpp
     rlvfloaterbehaviour.cpp
+    slfloatermediafilter.cpp
     viewertime.cpp
     viewerversion.cpp
     windlightsettingsupdate.cpp
@@ -967,6 +968,7 @@ set(viewer_HEADER_FILES
     rlvmultistringsearch.h
     rlvextensions.h
     rlvfloaterbehaviour.h
+    slfloatermediafilter.h
     VertexCache.h
     VorbisFramework.h
     viewertime.h
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 51bb456..c9e9127 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -58,6 +58,7 @@
                                                         <!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
                                                         <!--<string>Media</string>-->
+                                                        <string>MediaFilter</string>
                                                         <!--<string>MediaInfo</string>-->
                                                         <!--<string>MediaCallback</string>-->
                                                         <!--<string>MediaBuffering</string>-->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 59c2982..2a508ee 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7990,6 +7990,33 @@
     <key>Value</key>
     <real>3.0</real>
   </map>
+  <key>MediaEnableFilter</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable media domain filtering</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>MediaFilterRect</key>
+  <map>
+    <key>Comment</key>
+    <string>Rectangle for Media Filter floater</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Rect</string>
+    <key>Value</key>
+    <array>
+      <integer>0</integer>
+      <integer>100</integer>
+      <integer>100</integer>
+      <integer>100</integer>
+    </array>
+  </map>
   <key>MediaOnAPrimUI</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
index 4ab96f9..338fc26 100755
--- a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -18,7 +18,7 @@ LLGCONFTOOL2=gconftool-2
 if which ${LLGCONFTOOL2} >/dev/null; then
     (${LLGCONFTOOL2} -s -t string /desktop/gnome/url-handlers/secondlife/command "${HANDLER} \"%s\"" && ${LLGCONFTOOL2} -s -t bool /desktop/gnome/url-handlers/secondlife/enabled true) || echo Warning: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} failed.
 else
-    echo Warning: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} not found.
+    echo Info: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} not found. You can safely ignore this if you are not using GNOME.
 fi
 
 # Register handler for KDE-aware apps
@@ -42,5 +42,5 @@ makedir=false
 deleting=false
 EOF
 else
-    echo Warning: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist.
+    echo Info: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist. You can safely ignore this if you are not using KDE.
 fi
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index a43ebd5..f6ce272 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -126,7 +126,7 @@ if [ -n "$LL_RUN_ERR" ]; then
         LL_RUN_ERR_MSG=""
         if [ "$LL_RUN_ERR" = "runerr" ]; then
                 # generic error running the binary
-                echo '*** Bad shutdown. ***'
+                echo 'unexpected shutdown'
 
 
         fi
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 4e1d03e..93b73c7 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -383,6 +383,23 @@ void LLOverlayBar::onClickStandUp(void*)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+void LLOverlayBar::audioFilterPlay()
+{
+        if (gOverlayBar && gOverlayBar->mMusicState != PLAYING)
+        {
+                gOverlayBar->mMusicState = PLAYING;
+        }
+}
+
+void LLOverlayBar::audioFilterStop()
+{
+        if (gOverlayBar && gOverlayBar->mMusicState != STOPPED)
+        {
+                gOverlayBar->mMusicState = STOPPED;
+        }
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // static media helpers
 // *TODO: Move this into an audio manager abstraction
 //static
@@ -416,6 +433,7 @@ void LLOverlayBar::toggleMediaPlay(void*)
                 LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                 if (parcel)
                 {
+                        LLViewerParcelMedia::sIsUserAction = true;
                         LLViewerParcelMedia::play(parcel);
                 }
         }
@@ -447,7 +465,8 @@ void LLOverlayBar::toggleMusicPlay(void*)
                                 // stream is stopped, it doesn't return the right thing - commenting out for now.
         //                      if ( gAudioStream->isInternetStreamPlaying() == 0 )
                                 {
-                                        gAudioStream->startInternetStream(parcel->getMusicURL());
+                                        LLViewerParcelMedia::sIsUserAction = true;
+                                        LLViewerParcelMedia::playStreamingMusic(parcel);
                                 }
                         }
                 }
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 233f5c5..f776639 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -77,6 +77,10 @@ public:
         static void onClickStandUp(void* data);
         static void onClickResetView(void* data);
 
+        // media filter
+        static void audioFilterPlay();
+        static void audioFilterStop();
+
         //static media helper functions
         static void toggleMediaPlay(void*);
         static void toggleMusicPlay(void*);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 164e038..c9cdc8f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2834,6 +2834,8 @@ bool idle_startup()
                         gFloaterTeleportHistory->addEntry(regionp->getName(),(S16)agent_pos.mV[0],(S16)agent_pos.mV[1],(S16)agent_pos.mV[2],false);
                 }
 
+                LLViewerParcelMedia::loadDomainFilterList();
+
                 // Let the map know about the inventory.
                 if(gFloaterWorldMap)
                 {
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 572f64a..0a23045 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -63,6 +63,7 @@
 #include "llworld.h"
 #include "pipeline.h"
 #include "llviewerjoystick.h"
+#include "llviewerparcelmedia.h"
 #include "llviewerparcelmgr.h"
 #include "llparcel.h"
 #include "llnotify.h"
@@ -324,7 +325,7 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
                                 // otherwise music will briefly stop
                                 if ( !gAudioStream->isInternetStreamPlaying() )
                                 {
-                                        gAudioStream->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL());
+                                        LLViewerParcelMedia::playStreamingMusic(LLViewerParcelMgr::getInstance()->getAgentParcel());
                                 }
                         }
                 }
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index cf3cec1..a22f704 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -234,6 +234,7 @@
 #include "hippolimits.h"
 
 #include "llfloaterteleporthistory.h"
+#include "slfloatermediafilter.h"
 
 using namespace LLVOAvatarDefines;
 void init_client_menu(LLMenuGL* menu);
@@ -5996,6 +5997,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterMute::toggleInstance();
                 }
+                else if (floater_name == "media filter")
+                {
+                        SLFloaterMediaFilter::toggleInstance();
+                }
                 else if (floater_name == "camera controls")
                 {
                         LLFloaterCamera::toggleInstance();
@@ -6161,6 +6166,10 @@ class LLFloaterVisible : public view_listener_t
                 {
                         new_value = LLFloaterMute::instanceVisible();
                 }
+                else if (floater_name == "media filter")
+                {
+                        new_value = SLFloaterMediaFilter::instanceVisible();
+                }
                 else if (floater_name == "camera controls")
                 {
                         new_value = LLFloaterCamera::instanceVisible();
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index d4ebbd9..a5d97f2 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -33,6 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llviewerparcelmedia.h"
 
+#include "kokuastreamingaudio.h"
 #include "llagent.h"
 #include "llviewercontrol.h"
 #include "llviewermedia.h"
@@ -46,17 +47,27 @@
 #include "llviewerwindow.h"
 #include "llfirstuse.h"
 #include "llpluginclassmedia.h"
+#include "llnotify.h"
+#include "llsdserialize.h"
 
+#include "lloverlaybar.h"
+#include "slfloatermediafilter.h"
+#include "llinventorymodel.h"
 // Static Variables
 
 S32 LLViewerParcelMedia::sMediaParcelLocalID = 0;
 LLUUID LLViewerParcelMedia::sMediaRegionID;
 viewer_media_t LLViewerParcelMedia::sMediaImpl;
-
+bool LLViewerParcelMedia::sIsUserAction = false;
+bool LLViewerParcelMedia::sMediaFilterListLoaded = false;
+LLSD LLViewerParcelMedia::sMediaFilterList;
+std::set<std::string> LLViewerParcelMedia::sMediaQueries;
+std::set<std::string> LLViewerParcelMedia::sAllowedMedia;
+std::set<std::string> LLViewerParcelMedia::sDeniedMedia;
 
 // Local functions
 bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel);
-
+void callback_media_alert(const LLSD& notification, const LLSD& response, LLParcel* parcel, U32 type, std::string domain);
 
 // static
 void LLViewerParcelMedia::initClass()
@@ -175,7 +186,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 }
 
 // static
-void LLViewerParcelMedia::play(LLParcel* parcel)
+void LLViewerParcelMedia::play(LLParcel* parcel, bool filter)
 {
         lldebugs << "LLViewerParcelMedia::play" << llendl;
 
@@ -185,7 +196,17 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
                 return;
 
         std::string media_url = parcel->getMediaURL();
-        std::string media_current_url = parcel->getMediaCurrentURL();
+        LLStringUtil::trim(media_url);
+
+        if (!media_url.empty() && gSavedSettings.getBOOL("MediaEnableFilter") && (filter || !allowedMedia(media_url)))
+        {
+                // If filtering is needed or in case media_url just changed
+                // to something we did not yet approve.
+                LLViewerParcelMediaAutoPlay::playStarted();
+                filterMedia(parcel, 0);
+                return;
+        }
+
         std::string mime_type = parcel->getMediaType();
         LLUUID placeholder_texture_id = parcel->getMediaID();
         U8 media_auto_scale = parcel->getMediaAutoScale();
@@ -403,6 +424,8 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
         media_url = media_url_buffer;
         msg->getU8("DataBlock", "MediaAutoScale", media_auto_scale);
 
+        LL_DEBUGS("MediaFilter") << "New media texture id: " << media_id << LL_ENDL;
+
         if (msg->has("DataBlockExtended")) // do we have the extended data?
         {
                 char media_type_buffer[257];
@@ -438,6 +461,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
 
                         play(parcel);
                 }
+
         }
 }
 // Static
@@ -586,3 +610,368 @@ void LLViewerParcelMediaNavigationObserver::onNavigateComplete( const EventType&
 
 }
 */
+
+void LLViewerParcelMedia::playStreamingMusic(LLParcel* parcel, bool filter)
+{
+        std::string music_url = parcel->getMusicURL();
+        LLStringUtil::trim(music_url);
+        if (!music_url.empty() && gSavedSettings.getBOOL("MediaEnableFilter") && (filter || !allowedMedia(music_url)))
+        {
+                // If filtering is needed or in case music_url just changed
+                // to something we did not yet approve.
+                filterMedia(parcel, 1);
+        }
+        else if (gAudioStream)
+        {
+                LLStringUtil::trim(music_url);
+                gAudioStream->startInternetStream(music_url);
+                if (music_url.empty())
+                {
+                        LLOverlayBar::audioFilterStop();
+                }
+                else
+                {
+                        LLOverlayBar::audioFilterPlay();
+                }
+        }
+}
+
+void LLViewerParcelMedia::stopStreamingMusic()
+{
+        if (gAudioStream)
+        {
+                gAudioStream->stopInternetStream();
+                LLOverlayBar::audioFilterStop();
+        }
+}
+
+bool LLViewerParcelMedia::allowedMedia(std::string media_url)
+{
+        LLStringUtil::trim(media_url);
+        std::string domain = extractDomain(media_url);
+        if (sAllowedMedia.count(domain))
+        {
+                return true;
+        }
+        for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
+        {
+                if (sMediaFilterList[i]["domain"].asString() == domain)
+                {
+                        if (sMediaFilterList[i]["action"].asString() == "allow")
+                        {
+                                return true;
+                        }
+                        else
+                        {
+                                return false;
+                        }
+                }
+        }
+        return false;
+}
+
+void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
+{
+        std::string media_action;
+        std::string media_url;
+        std::string domain;
+
+        if (parcel != LLViewerParcelMgr::getInstance()->getAgentParcel())
+        {
+                // The parcel just changed (may occur right out after a TP)
+                sIsUserAction = false;
+                return;
+        }               
+
+        if (type == 0)
+        {
+                media_url = parcel->getMediaURL();
+        }
+        else
+        {
+                media_url = parcel->getMusicURL();
+        }
+        LLStringUtil::trim(media_url);
+
+        LL_DEBUGS("MediaFilter") << "Requested " << (type == 0 ? "media" : "music") << "-URL: " << media_url << LL_ENDL;
+
+        domain = extractDomain(media_url);
+
+        if (sMediaQueries.count(domain) > 0)
+        {
+                sIsUserAction = false;
+                return;
+        }
+
+        if (sIsUserAction)
+        {
+                // This was a user manual request to play this media, so give
+                // it another chance...
+                sIsUserAction = false;
+                if (sDeniedMedia.count(domain))
+                {
+                        sDeniedMedia.erase(domain);
+                        SLFloaterMediaFilter::setDirty();
+                }
+        }
+
+        if (!sMediaFilterListLoaded || sDeniedMedia.count(domain))
+        {
+                media_action = "ignore";
+        }
+        else if (sAllowedMedia.count(domain))
+        {
+                media_action = "allow";
+        }
+        else
+        {
+                for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
+                {
+                        if (sMediaFilterList[i]["domain"].asString() == domain)
+                        {
+                                media_action = sMediaFilterList[i]["action"].asString();
+                                break;
+                        }
+                }
+        }
+
+        if (media_action == "allow" || media_url.empty())
+        {
+                if (type == 0)
+                {
+                        play(parcel, false);
+                }
+                else
+                {
+                        playStreamingMusic(parcel, false);
+                }
+        }
+        else if (media_action == "deny")
+        {
+                LLSD args;
+                args["DOMAIN"] = domain;
+                LLNotifications::instance().add("MediaBlocked", args);
+                if (type == 1)
+                {
+                        LLViewerParcelMedia::stopStreamingMusic();
+                }
+                // So to avoid other "blocked" messages later in the session
+                // for this url should it be requested again by a script.
+                sDeniedMedia.insert(domain);
+        }
+        else if (media_action == "ignore")
+        {
+                if (type == 1)
+                {
+                        LLViewerParcelMedia::stopStreamingMusic();
+                }
+        }
+        else
+        {
+                sMediaQueries.insert(domain);
+                LLSD args;
+                args["DOMAIN"] = domain;
+                if (media_url.find('?') != std::string::npos)
+                {
+                        args["WARNING"] = " (WARNING: this URL also contains parameter(s) that could potentially be used to correlate your avatar name with your IP)";
+                }
+                else
+                {
+                        args["WARNING"] = "";
+                }
+                if (type == 0)
+                {
+                        args["TYPE"] = "a media";
+                }
+                else
+                {
+                        args["TYPE"] = "an audio";
+                }
+                LLNotifications::instance().add("MediaAlert", args, LLSD(), boost::bind(callback_media_alert, _1, _2, parcel, type, domain));
+        }
+}
+
+void callback_media_alert(const LLSD &notification, const LLSD &response, LLParcel* parcel, U32 type, std::string domain)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+
+        LLSD args;
+        args["DOMAIN"] = domain;
+
+        if (option == 0 || option == 3) // Allow or Whitelist
+        {
+                LLViewerParcelMedia::sAllowedMedia.insert(domain);
+                if (option == 3) // Whitelist
+                {
+                        LLSD newmedia;
+                        newmedia["domain"] = domain;
+                        newmedia["action"] = "allow";
+                        LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        LLViewerParcelMedia::saveDomainFilterList();
+                        args["LISTED"] = "whitelisted";
+                        LLNotifications::instance().add("MediaListed", args);
+                }
+                if (type == 0)
+                {
+                        LLViewerParcelMedia::play(parcel, false);
+                }
+                else
+                {
+                        LLViewerParcelMedia::playStreamingMusic(parcel, false);
+                }
+        }
+        else if (option == 1 || option == 2) // Deny or Blacklist
+        {
+                LLViewerParcelMedia::sDeniedMedia.insert(domain);
+                if (type == 1)
+                {
+                        LLViewerParcelMedia::stopStreamingMusic();
+                }
+                if (option == 1) // Deny
+                {
+                        LLNotifications::instance().add("MediaBlocked", args);
+                }
+                else // Blacklist
+                {
+                        LLSD newmedia;
+                        newmedia["domain"] = domain;
+                        newmedia["action"] = "deny";
+                        LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                        LLViewerParcelMedia::saveDomainFilterList();
+                        args["LISTED"] = "blacklisted";
+                        LLNotifications::instance().add("MediaListed", args);
+                }
+        }
+
+        LLViewerParcelMedia::sMediaQueries.erase(domain);
+        SLFloaterMediaFilter::setDirty();
+}
+
+void LLViewerParcelMedia::saveDomainFilterList()
+{
+        std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "media_filter.xml");
+
+        llofstream medialistFile(medialist_filename);
+        LLSDSerialize::toPrettyXML(sMediaFilterList, medialistFile);
+        medialistFile.close();
+}
+
+bool LLViewerParcelMedia::loadDomainFilterList()
+{
+        sMediaFilterListLoaded = true;
+
+        std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "media_filter.xml");
+
+        if (!LLFile::isfile(medialist_filename))
+        {
+                LLSD emptyllsd;
+                llofstream medialistFile(medialist_filename);
+                LLSDSerialize::toPrettyXML(emptyllsd, medialistFile);
+                medialistFile.close();
+        }
+
+        if (LLFile::isfile(medialist_filename))
+        {
+                llifstream medialistFile(medialist_filename);
+                LLSDSerialize::fromXML(sMediaFilterList, medialistFile);
+                medialistFile.close();
+                SLFloaterMediaFilter::setDirty();
+                return true;
+        }
+        else
+        {
+                return false;
+        }
+}
+
+void LLViewerParcelMedia::clearDomainFilterList()
+{
+        sMediaFilterList.clear();
+        sAllowedMedia.clear();
+        sDeniedMedia.clear();
+        saveDomainFilterList();
+        LLNotifications::instance().add("MediaFiltersCleared");
+        SLFloaterMediaFilter::setDirty();
+}
+
+std::string LLViewerParcelMedia::extractDomain(std::string url)
+{
+        static std::string last_region = "@";
+
+        if (url.empty())
+        {
+                return url;
+        }
+
+        LLStringUtil::toLower(url);
+
+        size_t pos = url.find("//");
+
+        if (pos != std::string::npos)
+        {
+                size_t count = url.size() - pos + 2;
+                url = url.substr(pos + 2, count);
+        }
+
+        // Check that there is at least one slash in the URL and add a trailing
+        // one if not (for media/audio URLs such as http://mydomain.net)
+        if (url.find('/') == std::string::npos)
+        {
+                url += '/';
+        }
+
+        // If there's a user:password@ part, remove it
+        pos = url.find('@');
+        if (pos != std::string::npos && pos < url.find('/'))    // if '@' is not before the first '/', then it's not a user:password
+        {
+                size_t count = url.size() - pos + 1;
+                url = url.substr(pos + 1, count);
+        }
+
+        if (url.find(gAgent.getRegion()->getHost().getHostName()) == 0 || url.find(last_region) == 0)
+        {
+                // This must be a scripted object rezzed in the region:
+                // extend the concept of "domain" to encompass the
+                // scripted object server id and avoid blocking all other
+                // objects at once in this region...
+
+                // Get rid of any port number
+                pos = url.find('/');            // We earlier made sure that there's one
+                url = gAgent.getRegion()->getHost().getHostName() + url.substr(pos);
+
+                pos = url.find('?');
+                if (pos != std::string::npos)
+                {
+                        // Get rid of any parameter
+                        url = url.substr(0, pos);
+                }
+
+                pos = url.rfind('/');
+                if (pos != std::string::npos)
+                {
+                        // Get rid of the filename, if any, keeping only the server + path
+                        url = url.substr(0, pos);
+                }
+        }
+        else
+        {
+                pos = url.find(':');  
+                if (pos != std::string::npos && pos < url.find('/'))
+                {
+                        // Keep anything before the port number and strip the rest off
+                        url = url.substr(0, pos);
+                }
+                else
+                {
+                        pos = url.find('/');    // We earlier made sure that there's one
+                        url = url.substr(0, pos);
+                }
+        }
+
+                
+        // Remember this region, so to cope with requests occuring just after a
+        // TP out of it.
+        last_region = gAgent.getRegion()->getHost().getHostName();
+
+        return url;
+}
diff --git a/linden/indra/newview/llviewerparcelmedia.h b/linden/indra/newview/llviewerparcelmedia.h
index 0f1e85c..7531a0f 100644
--- a/linden/indra/newview/llviewerparcelmedia.h
+++ b/linden/indra/newview/llviewerparcelmedia.h
@@ -35,6 +35,9 @@
 
 #include "llviewermedia.h"
 
+// For use by other patches so they know that media filtering is implemented.
+#define MEDIA_FILTERING 1
+
 class LLMessageSystem;
 class LLParcel;
 class LLViewerParcelMediaNavigationObserver;
@@ -54,8 +57,20 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
                         // called when the agent's parcel has a new URL, or the agent has
                         // walked on to a new parcel with media
 
-                static void play(LLParcel* parcel);
+                static void play(LLParcel* parcel, bool filter = true);
                         // user clicked play button in media transport controls
+                static void playStreamingMusic(LLParcel* parcel, bool filter = true);
+                        // play the parcel music stream
+                static void stopStreamingMusic();
+                        // stop the parcel music stream
+
+                static void filterMedia(LLParcel* parcel, U32 type); // type: 0 = media, 1 = streaming music
+                static bool allowedMedia(std::string media_url);
+
+                static bool loadDomainFilterList();
+                static void saveDomainFilterList();
+                static void clearDomainFilterList();
+                static std::string extractDomain(std::string url);
 
                 static void stop();
                         // user clicked stop button in media transport controls
@@ -85,6 +100,13 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
                 static LLUUID sMediaRegionID;
                 // HACK: this will change with Media on a Prim
                 static viewer_media_t sMediaImpl;
+
+                static bool sIsUserAction;
+                static bool sMediaFilterListLoaded;
+                static LLSD sMediaFilterList;
+                static std::set<std::string> sMediaQueries;
+                static std::set<std::string> sAllowedMedia;
+                static std::set<std::string> sDeniedMedia;
 };
 
 
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index b99b0c0..11ab647 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -85,7 +85,7 @@ LLPointer<LLViewerImage> sBlockedImage;
 LLPointer<LLViewerImage> sPassImage;
 
 // Local functions
-void optionally_start_music(const std::string& music_url);
+void optionally_start_music(LLParcel* parcel);
 void callback_start_music(S32 option, void* data);
 void optionally_prepare_video(const LLParcel *parcelp);
 void callback_prepare_video(S32 option, void* data);
@@ -1706,7 +1706,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                                         {
                                                 if (music_url.substr(0,7) == "http://")
                                                 {
-                                                        optionally_start_music(music_url);
+                                                        optionally_start_music(parcel);
                                                 }
                                         }
                                         else if (!gAudioStream->getInternetStreamURL().empty())
@@ -1728,18 +1728,18 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
         };
 }
 
-void optionally_start_music(const std::string& music_url)
+void optionally_start_music(LLParcel* parcel)
 {
         if (gSavedSettings.getBOOL("AudioStreamingMusic"))
         {
                 // Make the user click the start button on the overlay bar. JC
-                //              llinfos << "Starting parcel music " << music_url << llendl;
+                //              llinfos << "Starting parcel music " << parcel->getMusicURL() << llendl;
 
                 // now only play music when you enter a new parcel if the control is in PLAY state
                 // changed as part of SL-4878
-                if ( gOverlayBar && gOverlayBar->musicPlaying())
+                if (gOverlayBar && gOverlayBar->musicPlaying())
                 {
-                        gAudioStream->startInternetStream(music_url);
+                        LLViewerParcelMedia::playStreamingMusic(parcel);
                 }
         }
 }
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index b4ef3ff..269a3d0 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1309,7 +1309,7 @@ LLViewerWindow::LLViewerWindow(
         {
                 gSavedSettings.setBOOL("RenderVBOEnable", FALSE);
         }
-        LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"));
+        LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable") && gGLManager.mHasVertexBufferObject);
 
         if (LLFeatureManager::getInstance()->isSafe()
                 || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion())
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 5517ca2..c05f685 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1537,12 +1537,10 @@ void LLVoiceClient::start()
 
 void LLVoiceClient::stateMachine()
 {
-        if(gDisconnected)
-        {
-                // The viewer has been disconnected from the sim.  Disable voice.
-                setVoiceEnabled(false);
-        }
-        
+
+        // Disable voice as long as the viewer is disconnected from the sim (login/relog)
+        setVoiceEnabled(!gDisconnected);
+
         if(mVoiceEnabled)
         {
                 updatePosition();
@@ -1559,7 +1557,7 @@ void LLVoiceClient::stateMachine()
                         if(!mConnected)
                         {
                                 // if voice was turned off after the daemon was launched but before we could connect to it, we may need to issue a kill.
-                                LL_INFOS("Voice") << "Disabling voice before connection to daemon, terminating." << LL_ENDL;
+                                LL_WARNS("Voice") << "Disabling voice before connection to daemon, terminating." << LL_ENDL;
                                 killGateway();
                         }
                         
@@ -1764,7 +1762,7 @@ void LLVoiceClient::stateMachine()
                                         }       
                                         else
                                         {
-                                                LL_INFOS("Voice") << exe_path << " not found." << LL_ENDL;
+                                                LL_WARNS("Voice") << exe_path << " not found." << LL_ENDL;
                                                 mVoiceEnabled = false;
                                         }       
                                 }
@@ -3783,7 +3781,7 @@ void LLVoiceClient::loginResponse(int statusCode, std::string &statusString, std
         if ( statusCode == 401 )
         {
                 // Login failure which is probably caused by the delay after a user's password being updated.
-                LL_INFOS("Voice") << "Account.Login response failure (" << statusCode << "): " << statusString << LL_ENDL;
+                LL_WARNS("Voice") << "Account.Login response failure (" << statusCode << "): " << statusString << LL_ENDL;
                 setState(stateLoginRetry);
         }
         else if(statusCode != 0)
@@ -3961,7 +3959,7 @@ void LLVoiceClient::sessionAddedEvent(
                         }
                         else
                         {
-                                LL_INFOS("Voice") << "Could not generate caller id from uri, using hash of uri " << session->mSIPURI << LL_ENDL;
+                                LL_WARNS("Voice") << "Could not generate caller id from uri, using hash of uri " << session->mSIPURI << LL_ENDL;
                                 setUUIDFromStringHash(session->mCallerID, session->mSIPURI);
                                 session->mSynthesizedCallerID = true;
                                 
@@ -4479,7 +4477,7 @@ void LLVoiceClient::participantUpdatedEvent(
         }
         else
         {
-                LL_INFOS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+                LL_WARNS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
         }
 }
 
@@ -5073,7 +5071,7 @@ void LLVoiceClient::parcelChanged()
         else
         {
                 // The transition to stateNoChannel needs to kick this off again.
-                LL_INFOS("Voice") << "not logged in yet, deferring" << LL_ENDL;
+                LL_WARNS("Voice") << "not logged in yet, deferring" << LL_ENDL;
         }
 }
 
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 36ffb05..5458af5 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -4934,7 +4934,7 @@ void LLPipeline::setUseVBO(BOOL use_vbo)
                 }
                 
                 resetVertexBuffers();
-                LLVertexBuffer::initClass(use_vbo);
+                LLVertexBuffer::initClass(use_vbo && gGLManager.mHasVertexBufferObject);
         }
 }
 
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
diff --git a/linden/indra/newview/slfloatermediafilter.cpp b/linden/indra/newview/slfloatermediafilter.cpp
new file mode 100644
index 0000000..c47ed26
--- /dev/null
+++ b/linden/indra/newview/slfloatermediafilter.cpp
@@ -0,0 +1,350 @@
+/** 
+ * @file slfloatermediafilter.cpp
+ * @brief The SLFloaterMediaFilter class definitions
+ *
+ * $LicenseInfo:firstyear=2011&license=viewergpl$
+ * 
+ * Copyright (c) 2011, Sione Lomu
+ * with debugging and improvements by Henri Beauchamp
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "lllineeditor.h"
+#include "llscrolllistctrl.h"
+#include "lluictrlfactory.h" 
+
+#include "slfloatermediafilter.h"
+#include "llviewercontrol.h"
+#include "llviewerparcelmedia.h"
+
+SLFloaterMediaFilter* SLFloaterMediaFilter::sInstance = NULL;
+bool SLFloaterMediaFilter::sIsWhitelist = false;
+
+SLFloaterMediaFilter::SLFloaterMediaFilter() : LLFloater(std::string("media filter")), mIsDirty(false)
+{
+    LLUICtrlFactory::getInstance()->buildFloater(this, "floater_media_filter.xml");
+}
+
+SLFloaterMediaFilter::~SLFloaterMediaFilter()
+{
+    sInstance = NULL;
+}
+
+BOOL SLFloaterMediaFilter::postBuild()
+{
+        mWhitelistSLC = getChild<LLScrollListCtrl>("whitelist_list");
+        mBlacklistSLC = getChild<LLScrollListCtrl>("blacklist_list");
+
+        if (mWhitelistSLC && mBlacklistSLC)
+        {
+                childSetAction("clear_lists", onClearLists, this);
+                childSetAction("add_whitelist", onWhitelistAdd, this);
+                childSetAction("remove_whitelist", onWhitelistRemove, this);
+                childSetAction("add_blacklist", onBlacklistAdd, this);
+                childSetAction("remove_blacklist", onBlacklistRemove, this);
+                childSetAction("commit_domain", onCommitDomain, this);
+                childSetUserData("whitelist_list", this);
+                childSetUserData("blacklist_list", this);
+                mIsDirty = true;
+        }
+
+        return TRUE;
+}
+
+void SLFloaterMediaFilter::draw()
+{
+        if (mIsDirty && mWhitelistSLC && mBlacklistSLC)
+        {
+                S32 whitescrollpos = mWhitelistSLC->getScrollPos();
+                S32 blackscrollpos = mBlacklistSLC->getScrollPos();
+                mWhitelistSLC->deleteAllItems();
+                mBlacklistSLC->deleteAllItems();
+                std::set<std::string> listed;
+                std::string domain;
+                std::string action;
+                LLSD element;
+                element["columns"][0]["font"] = "SANSSERIF";
+                element["columns"][0]["font-style"] = "BOLD";
+                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                {
+                        domain = LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString();
+                        action = LLViewerParcelMedia::sMediaFilterList[i]["action"].asString();
+                        if (!domain.empty() && action == "allow")
+                        {       
+                                element["columns"][0]["column"] = "whitelist_col";
+                                element["columns"][0]["value"] = domain;
+                                //element["columns"][0]["color"] = LLColor4::green3.getValue();
+                                mWhitelistSLC->addElement(element, ADD_BOTTOM);
+                                listed.insert(domain);
+                        }
+                        else if (!domain.empty() && action == "deny")
+                        {
+                                element["columns"][0]["column"] = "blacklist_col";
+                                element["columns"][0]["value"] = domain;
+                                //element["columns"][0]["color"] = LLColor4::red2.getValue();
+                                mBlacklistSLC->addElement(element, ADD_BOTTOM);
+                                listed.insert(domain);
+                        }
+                        else
+                        {
+                                LL_WARNS("MediaFilter") << "Bad media filter list: removing corrupted entry for \"" << domain << "\"" << LL_ENDL;
+                                LLViewerParcelMedia::sMediaFilterList.erase(i--);
+                        }
+                }
+                std::set<std::string>::iterator it;
+                element["columns"][0]["font"] = "SANSSERIF";
+                element["columns"][0]["font-style"] = "ITALIC";
+                //element["columns"][0]["color"] = LLColor4::green3.getValue();
+                element["columns"][0]["column"] = "whitelist_col";
+                for (it = LLViewerParcelMedia::sAllowedMedia.begin(); it != LLViewerParcelMedia::sAllowedMedia.end(); it++)
+                {
+                        domain = *it;
+                        if (listed.count(domain) == 0)
+                        {
+                                element["columns"][0]["value"] = domain;
+                                mWhitelistSLC->addElement(element, ADD_BOTTOM);
+                        }
+                }
+                element["columns"][0]["column"] = "blacklist_col";
+                for (it = LLViewerParcelMedia::sDeniedMedia.begin(); it != LLViewerParcelMedia::sDeniedMedia.end(); it++)
+                {
+                        domain = *it;
+                        if (listed.count(domain) == 0)
+                        {
+                                element["columns"][0]["value"] = domain;
+                                mBlacklistSLC->addElement(element, ADD_BOTTOM);
+                        }
+                }
+                mWhitelistSLC->setScrollPos(whitescrollpos);
+                mBlacklistSLC->setScrollPos(blackscrollpos);
+
+                if (!gSavedSettings.getBOOL("MediaEnableFilter"))
+                {
+                        childDisable("clear_lists");
+                        childDisable("blacklist_list");
+                        childDisable("whitelist_list");
+                        childDisable("remove_whitelist");
+                        childDisable("add_whitelist");
+                        childDisable("remove_blacklist");
+                        childDisable("add_blacklist");
+                        childDisable("input_domain");
+                        childDisable("commit_domain");
+                        childSetText("add_text", std::string("****** WARNING: media filtering is currently DISABLED ******"));
+                }
+
+                mIsDirty = false;
+        }
+
+        LLFloater::draw();
+}
+
+void SLFloaterMediaFilter::setDirty()
+{
+    if (sInstance)
+        {
+                sInstance->mIsDirty = true;
+                sInstance->draw();
+        }
+}
+
+BOOL SLFloaterMediaFilter::instanceVisible()
+{
+        if (sInstance)
+        {
+                return sInstance->getVisible();
+        }
+        else
+        {
+                return FALSE;
+        }
+}
+
+void SLFloaterMediaFilter::toggleInstance()
+{
+        if (sInstance)
+        {
+                if (sInstance->getVisible())
+                {
+                        sInstance->destroy();
+                }
+                else
+                {
+                        sInstance->open();
+                }
+        }
+        else
+        {
+                sInstance = new SLFloaterMediaFilter();
+        sInstance->open();
+        }
+}
+
+void SLFloaterMediaFilter::onClearLists(void* data)
+{
+        LLViewerParcelMedia::clearDomainFilterList();
+}
+
+void SLFloaterMediaFilter::onWhitelistAdd(void* data)
+{
+    if (!sInstance)
+        {
+                return;
+        }
+        sInstance->childDisable("clear_lists");
+        sInstance->childDisable("blacklist_list");
+        sInstance->childDisable("whitelist_list");
+        sInstance->childDisable("remove_whitelist");
+        sInstance->childDisable("add_whitelist");
+        sInstance->childDisable("remove_blacklist");
+        sInstance->childDisable("add_blacklist");
+        sInstance->childEnable("input_domain");
+        sInstance->childEnable("commit_domain");
+        sInstance->childSetText("add_text", std::string("Enter the domain/url to add to the white list:"));
+        sIsWhitelist = true;
+}
+
+void SLFloaterMediaFilter::onWhitelistRemove(void* data)
+{
+    if (!sInstance)
+        {
+                return;
+        }
+        LLScrollListItem* selected = sInstance->mWhitelistSLC->getFirstSelected();
+
+        if (selected)
+        {
+                std::string domain = sInstance->mWhitelistSLC->getSelectedItemLabel();
+                LLViewerParcelMedia::sAllowedMedia.erase(domain);
+
+                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                {
+                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
+                        {
+                                LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                LLViewerParcelMedia::saveDomainFilterList();
+                                break;
+                        }
+                }
+
+                setDirty();
+        }
+}
+
+void SLFloaterMediaFilter::onBlacklistAdd(void* data)
+{
+    if (!sInstance)
+        {
+                return;
+        }
+        sInstance->childDisable("clear_lists");
+        sInstance->childDisable("blacklist_list");
+        sInstance->childDisable("whitelist_list");
+        sInstance->childDisable("remove_whitelist");
+        sInstance->childDisable("add_whitelist");
+        sInstance->childDisable("remove_blacklist");
+        sInstance->childDisable("add_blacklist");
+        sInstance->childEnable("input_domain");
+        sInstance->childEnable("commit_domain");
+        sInstance->childSetText("add_text", std::string("Enter the domain/url to add to the black list:"));
+        sIsWhitelist = false;
+}
+
+void SLFloaterMediaFilter::onBlacklistRemove(void* data)
+{       
+    if (!sInstance)
+        {
+                return;
+        }
+        LLScrollListItem* selected = sInstance->mBlacklistSLC->getFirstSelected();
+
+        if (selected)
+        {
+                std::string domain = sInstance->mBlacklistSLC->getSelectedItemLabel();
+                LLViewerParcelMedia::sDeniedMedia.erase(domain);
+
+                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                {
+                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
+                        {
+                                LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                LLViewerParcelMedia::saveDomainFilterList();
+                                break;
+                        }
+                }
+
+                setDirty();
+        }
+}       
+
+void SLFloaterMediaFilter::onCommitDomain(void* data)
+{
+    if (!sInstance)
+        {
+                return;
+        }
+        std::string domain = sInstance->childGetText("input_domain");
+        domain = LLViewerParcelMedia::extractDomain(domain);
+
+        if (!domain.empty())
+        {
+                LLViewerParcelMedia::sDeniedMedia.erase(domain);
+                LLViewerParcelMedia::sAllowedMedia.erase(domain);
+                for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+                {
+                        if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
+                        {
+                                LLViewerParcelMedia::sMediaFilterList.erase(i);
+                                break;
+                        }
+                }
+                LLSD newmedia;
+                newmedia["domain"] = domain;
+                if (sIsWhitelist)
+                {
+                        newmedia["action"] = "allow";
+                }
+                else
+                {
+                        newmedia["action"] = "deny";
+                }
+                LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+                LLViewerParcelMedia::saveDomainFilterList();
+        }
+
+        sInstance->childEnable("clear_lists");
+        sInstance->childEnable("blacklist_list");
+        sInstance->childEnable("whitelist_list");
+        sInstance->childEnable("remove_whitelist");
+        sInstance->childEnable("add_whitelist");
+        sInstance->childEnable("remove_blacklist");
+        sInstance->childEnable("add_blacklist");
+        sInstance->childDisable("input_domain");
+        sInstance->childDisable("commit_domain");
+        sInstance->childSetText("add_text", std::string("New domain:"));
+        sInstance->childSetText("input_domain", std::string(""));
+        setDirty();
+}
diff --git a/linden/indra/newview/slfloatermediafilter.h b/linden/indra/newview/slfloatermediafilter.h
new file mode 100644
index 0000000..0f900be
--- /dev/null
+++ b/linden/indra/newview/slfloatermediafilter.h
@@ -0,0 +1,70 @@
+/** 
+ * @file slfloatermediafilter.h
+ * @brief The SLFloaterMediaFilter class declaration
+ *
+ * $LicenseInfo:firstyear=2011&license=viewergpl$
+ * 
+ * Copyright (c) 2011, Sione Lomu
+ * with debugging and improvements by Henri Beauchamp
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_SLFLOATERMEDIAFILTER_H
+#define LL_SLFLOATERMEDIAFILTER_H
+
+#include "llfloater.h"
+
+class LLScrollListCtrl;
+class LLButton;
+
+class SLFloaterMediaFilter : public LLFloater
+{
+public:
+        SLFloaterMediaFilter();
+        BOOL postBuild();
+        virtual void draw();
+        virtual ~SLFloaterMediaFilter();
+
+        static void setDirty();
+        static BOOL instanceVisible();
+        static void toggleInstance();
+
+        static void onClearLists(void*);
+        static void onWhitelistAdd(void*);
+        static void onWhitelistRemove(void*);
+        static void onBlacklistAdd(void*);
+        static void onBlacklistRemove(void*);
+        static void onCommitDomain(void*);
+
+private:
+        static bool sIsWhitelist;
+        LLScrollListCtrl* mWhitelistSLC;
+        LLScrollListCtrl* mBlacklistSLC;
+        bool mIsDirty;
+
+        static SLFloaterMediaFilter* sInstance;
+
+};
+#endif
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3651bea..8225b4c 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1018,7 +1018,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.2")
             self.path("libxml2.so.2")
-            self.path("libz.so.1")
+            self.path("libz.so.1","libz.so")
 
             # OpenAL
             self.path("libopenal.so.1.12.854", "libopenal.so.1")