Update Linux media handling (#1146)

* Enable CEF browser for Linux

* Disable the update for Linux, we don't have that one right now

* Update build_linux.yaml

We need  libpulse-dev for volume_catcher Linux

* Add linux_volum_catcher* files

* Enable OpenAL for Linux-ReleaseOS

* Linux: Update OpenAL

* Update SDL2

* Add libsndio-dev to the dependencies.

* Update CEF to an official LL version

* Remove dupe of emoji_shortcodes

* Reording autobuild does because it can and wants to

* Linux: Disable NDOF for the time being. After updating the ndof 3P needs to be rebuilt and we do not have a fresh one from LL yet.
Forcefully undefine LIB_NDOF, it gets defined in the build variables no matter if it is safe to define.

* Remove wrestling with mutliarch and LIBGL_DRIVERS_PATH

* Remove tcmalloc snippet, tcmalloc is a very faint bad dream of the past

* Putting out a warning this viewer ran on a x64 arch and then suggesting to install 32 bit compat packages makes no sense at all

* CEF resources need to be in lib

* It;'s okay to warn about missing plugins

* Linux: CEF keyboard handling

* Remove old gstreamer 0.10 implementation

* Linux DSO loading always had been very peculiar due to macro magic.
At least now it is peculiar shared magic with only one implementation.

* Remove -fPIC. We get that one from LL_BUILD

* /proc/cpuinfo is not reliable to detrmine the max CPU clock. Try to determine this by reading "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq".

Only if this fails go back to /proc/cpuinfo

* Cleanup

* Cleanup common linker and compiler flags, make it more obvious which flags are for which OS/compiler

* Switch to correct plugin file

* Install libpulse-dev for volume catcher.

* And the runner needs libsndio-dev as well.

* check for runner.os=='linux'. matrix.os is the full name of the image (limux-large).

38 files changed, 796 insertions, 2928 deletions

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 419ebebe3b..d46ebc4960 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -105,7 +105,6 @@ if (WINDOWS)
   endif()
 endif (WINDOWS)
 
-
 if (LINUX)
   set( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
   set( CMAKE_INSTALL_RPATH $ORIGIN $ORIGIN/../lib )
@@ -117,18 +116,14 @@ if (LINUX)
     set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_EXE} )
   endif()
 
-   # EXTERNAL_TOS
-   # force this platform to accept TOS via external browser
-
-   # LL_IGNORE_SIGCHLD
-   # don't catch SIGCHLD in our base application class for the viewer - some of
-   # our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The
-   # viewer doesn't need to catch SIGCHLD anyway.
+  # LL_IGNORE_SIGCHLD
+  # don't catch SIGCHLD in our base application class for the viewer - some of
+  # our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The
+  # viewer doesn't need to catch SIGCHLD anyway.
 
   add_compile_definitions(
           _REENTRANT
           _FORTIFY_SOURCE=2
-          EXTERNAL_TOS
           APPID=secondlife
           LL_IGNORE_SIGCHLD
   )
@@ -146,22 +141,27 @@ if (LINUX)
           -Wno-pessimizing-move
           -Wno-stringop-overflow
           -Wno-stringop-truncation
+          -Wno-dangling-pointer
           -fvisibility=hidden
   )
   add_link_options(
-    -Wl,--no-keep-memory
-    -Wl,--build-id
+          -Wl,--no-keep-memory
+          -Wl,--build-id
+          -Wl,--no-undefined
   )
+  if (NOT GCC_DISABLE_FATAL_WARNINGS)
+    list(APPEND GCC_WARNINGS -Werror)
+  endif (NOT GCC_DISABLE_FATAL_WARNINGS)
 
   # this stops us requiring a really recent glibc at runtime
   add_compile_options(-fno-stack-protector)
-  # linking can be very memory-hungry, especially the final viewer link
-  set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
-  set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
 
   # ND: clang is a bit more picky than GCC, the latter seems to auto include -lstdc++ and -lm. The former not so and thus fails to link
   if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -lstdc++ -lm")
+    add_link_options(
+            -lstdc++
+            -lm
+    )
   endif()
 endif (LINUX)
 
@@ -186,15 +186,9 @@ if (DARWIN)
   # required for clang-15/xcode-15 since our boost package still uses deprecated std::unary_function/binary_function
   # see https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#C++-Standard-Library
   add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
-endif (DARWIN)
 
-if (LINUX OR DARWIN)
   set(GCC_WARNINGS -Wall -Wno-sign-compare -Wno-trigraphs)
 
-  if (NOT GCC_DISABLE_FATAL_WARNINGS)
-    list(APPEND GCC_WARNINGS -Werror)
-  endif (NOT GCC_DISABLE_FATAL_WARNINGS)
-
   list(APPEND GCC_WARNINGS -Wno-reorder -Wno-non-virtual-dtor )
 
   if(LINUX)
@@ -203,4 +197,4 @@ if (LINUX OR DARWIN)
 
   add_compile_options(${GCC_WARNINGS})
   add_compile_options(-m${ADDRESS_SIZE})
-endif (LINUX OR DARWIN)
+endif ()
diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 9b77becf29..555d2aebbf 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -33,4 +33,9 @@ elseif (DARWIN)
        )
 
 elseif (LINUX)
+    target_link_libraries( ll::cef INTERFACE
+            libdullahan.a
+            cef
+            cef_dll_wrapper.a
+    )
 endif (WINDOWS)
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index 23f4115aeb..6c7b70461f 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -16,5 +16,5 @@ if (LINUX)
   #target_link_libraries( ll::SDL INTERFACE SDL2::SDL2 SDL2::SDL2main X11)
 
   use_prebuilt_binary(SDL2)
-  target_link_libraries( ll::SDL INTERFACE SDL2 X11)
+  target_link_libraries( ll::SDL INTERFACE SDL2 sndio X11)
 endif (LINUX)
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake
index b88fbccf2a..db9c8b1780 100644
--- a/indra/cmake/NDOF.cmake
+++ b/indra/cmake/NDOF.cmake
@@ -19,6 +19,6 @@ if (NDOF)
     target_link_libraries( ll::ndof INTERFACE ndofdev)
   endif (WINDOWS)
   target_compile_definitions( ll::ndof INTERFACE LIB_NDOF=1)
+else()
+  add_compile_options(-ULIB_NDOF)
 endif (NDOF)
-
-
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index ce3b1160c0..4cdc3d7519 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -793,19 +793,55 @@ private:
 };
 
 #elif LL_LINUX
+
+// *NOTE:Mani - eww, macros! srry.
+#define LLPI_SET_INFO_STRING(llpi_id, cpuinfo_id) \
+		if (!cpuinfo[cpuinfo_id].empty()) \
+		{ setInfo(llpi_id, cpuinfo[cpuinfo_id]);}
+
+#define LLPI_SET_INFO_INT(llpi_id, cpuinfo_id) \
+		{\
+			S32 result; \
+			if (!cpuinfo[cpuinfo_id].empty() \
+				&& LLStringUtil::convertToS32(cpuinfo[cpuinfo_id], result))	\
+		    { setInfo(llpi_id, result);} \
+		}
+
 const char CPUINFO_FILE[] = "/proc/cpuinfo";
 
-class LLProcessorInfoLinuxImpl : public LLProcessorInfoImpl
-{
+class LLProcessorInfoLinuxImpl : public LLProcessorInfoImpl {
 public:
-	LLProcessorInfoLinuxImpl() 
-	{
-		get_proc_cpuinfo();
-	}
+    LLProcessorInfoLinuxImpl() {
+        get_proc_cpuinfo();
+    }
+
+    virtual ~LLProcessorInfoLinuxImpl() {}
 
-	virtual ~LLProcessorInfoLinuxImpl() {}
 private:
 
+    F64 getCPUMaxMHZ()
+    {
+        // Nicky: We just look into cpu0. In theory we could iterate over all cores
+        // "/sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_max_freq"
+        // But those should not fluctuate that much?
+        std::ifstream fIn { "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq" };
+
+        if( !fIn.is_open() )
+            return 0.0;
+
+        std::string strLine;
+        fIn >> strLine;
+        if( strLine.empty() )
+            return 0.0l;
+
+        F64 mhz {};
+        if( !LLStringUtil::convertToF64(strLine, mhz ) )
+            return 0.0;
+
+        mhz = mhz / 1000.0;
+        return mhz;
+    }
+
 	void get_proc_cpuinfo()
 	{
 		std::map< std::string, std::string > cpuinfo;
@@ -834,31 +870,24 @@ private:
 				std::string llinename(linename);
 				LLStringUtil::toLower(llinename);
 				std::string lineval( spacespot + 1, nlspot );
-				cpuinfo[ llinename ] = lineval;
+                    cpuinfo[ llinename ] = lineval;
 			}
 			fclose(cpuinfo_fp);
 		}
 # if LL_X86
 
-// *NOTE:Mani - eww, macros! srry.
-#define LLPI_SET_INFO_STRING(llpi_id, cpuinfo_id) \
-		if (!cpuinfo[cpuinfo_id].empty()) \
-		{ setInfo(llpi_id, cpuinfo[cpuinfo_id]);}
-
-#define LLPI_SET_INFO_INT(llpi_id, cpuinfo_id) \
-		{\
-			S32 result; \
-			if (!cpuinfo[cpuinfo_id].empty() \
-				&& LLStringUtil::convertToS32(cpuinfo[cpuinfo_id], result))	\
-		    { setInfo(llpi_id, result);} \
-		}
-		
-		F64 mhz;
-		if (LLStringUtil::convertToF64(cpuinfo["cpu mhz"], mhz)
-			&& 200.0 < mhz && mhz < 10000.0)
-		{
-		    setInfo(eFrequency,(F64)(mhz));
-		}
+        F64 mhzFromSys = getCPUMaxMHZ();
+        F64 mhzFromProc {};
+        if( !LLStringUtil::convertToF64(cpuinfo["cpu mhz"], mhzFromProc ) )
+            mhzFromProc = 0.0;
+        if (mhzFromSys > 1.0 && mhzFromSys > mhzFromProc )
+        {
+            setInfo( eFrequency, mhzFromSys );
+        }
+        else if (  200.0 < mhzFromProc && mhzFromProc < 10000.0)
+        {
+            setInfo(eFrequency,(F64)(mhzFromProc));
+        }
 
 		LLPI_SET_INFO_STRING(eBrandName, "model name");		
 		LLPI_SET_INFO_STRING(eVendor, "vendor_id");
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 14a69afe6e..005426acde 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -31,14 +31,6 @@ set(llplugin_HEADER_FILES
     llpluginsharedmemory.h
     )
 
-if(NOT ADDRESS_SIZE EQUAL 32)
-  if(WINDOWS)
-    ##add_definitions(/FIXED:NO)
-  else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-    add_definitions(-fPIC)
-  endif(WINDOWS)
-endif(NOT ADDRESS_SIZE EQUAL 32)
-
 list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
 
 add_library (llplugin ${llplugin_SOURCE_FILES})
diff --git a/indra/media_plugins/CMakeLists.txt b/indra/media_plugins/CMakeLists.txt
index fe8fee5e7e..86c46cb476 100644
--- a/indra/media_plugins/CMakeLists.txt
+++ b/indra/media_plugins/CMakeLists.txt
@@ -3,8 +3,9 @@
 add_subdirectory(base)
 
 if (LINUX)
-    add_subdirectory(gstreamer10)
+    add_subdirectory(cef)
     add_subdirectory(example)
+    add_subdirectory(gstreamer10)
 endif (LINUX)
 
 if (DARWIN)
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index 64b6a4228d..5e635c6ca3 100644
--- a/indra/media_plugins/base/CMakeLists.txt
+++ b/indra/media_plugins/base/CMakeLists.txt
@@ -12,13 +12,6 @@ include(PluginAPI)
 
 ### media_plugin_base
 
-if(NOT ADDRESS_SIZE EQUAL 32)
-  if(WINDOWS)
-    ##add_definitions(/FIXED:NO)
-  else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-    add_definitions(-fPIC)
-  endif(WINDOWS)
-endif(NOT ADDRESS_SIZE EQUAL 32)
 
 set(media_plugin_base_SOURCE_FILES
     media_plugin_base.cpp
diff --git a/indra/media_plugins/base/media_plugin_base.cpp b/indra/media_plugins/base/media_plugin_base.cpp
index 37c498664a..dbbc973f00 100644
--- a/indra/media_plugins/base/media_plugin_base.cpp
+++ b/indra/media_plugins/base/media_plugin_base.cpp
@@ -167,6 +167,56 @@ void MediaPluginBase::sendStatus()
 	sendMessage(message);
 }
 
+#if LL_LINUX
+
+size_t SymbolGrabber::registerSymbol( SymbolToGrab aSymbol )
+{
+    gSymbolsToGrab.emplace_back(aSymbol);
+    return gSymbolsToGrab.size();
+}
+
+bool SymbolGrabber::grabSymbols(std::vector< std::string > const &aDSONames)
+{
+    std::cerr << "SYMBOLS: " << gSymbolsToGrab.size() << std::endl;
+
+    if (sSymsGrabbed)
+        return true;
+
+    //attempt to load the shared libraries
+    apr_pool_create(&sSymPADSOMemoryPool, nullptr);
+
+    for( std::vector< std::string >::const_iterator itr = aDSONames.begin(); itr != aDSONames.end(); ++itr )
+    {
+        apr_dso_handle_t *pDSO(NULL);
+        std::string strDSO{ *itr };
+        if( APR_SUCCESS == apr_dso_load( &pDSO, strDSO.c_str(), sSymPADSOMemoryPool ))
+            sLoadedLibraries.push_back( pDSO );
+
+        for( auto i = 0; i < gSymbolsToGrab.size(); ++i )
+        {
+            if( !*gSymbolsToGrab[i].mPPFunc )
+                apr_dso_sym( gSymbolsToGrab[i].mPPFunc, pDSO, gSymbolsToGrab[i].mName );
+        }
+    }
+
+    bool sym_error = false;
+
+    for( auto i = 0; i < gSymbolsToGrab.size(); ++i )
+    {
+        if( gSymbolsToGrab[ i ].mRequired && ! *gSymbolsToGrab[ i ].mPPFunc )
+            sym_error = true;
+    }
+
+    sSymsGrabbed = !sym_error;
+    return sSymsGrabbed;
+}
+
+void SymbolGrabber::ungrabSymbols()
+{
+
+}
+#endif
+
 
 #if LL_WINDOWS
 # define LLSYMEXPORT __declspec(dllexport)
diff --git a/indra/media_plugins/base/media_plugin_base.h b/indra/media_plugins/base/media_plugin_base.h
index 38b8226bb3..2e975a5bf2 100644
--- a/indra/media_plugins/base/media_plugin_base.h
+++ b/indra/media_plugins/base/media_plugin_base.h
@@ -32,6 +32,34 @@
 #include "llpluginmessage.h"
 #include "llpluginmessageclasses.h"
 
+#if LL_LINUX
+
+struct SymbolToGrab
+{
+    bool mRequired;
+    char const *mName;
+    apr_dso_handle_sym_t *mPPFunc;
+};
+
+class SymbolGrabber
+{
+public:
+    size_t registerSymbol( SymbolToGrab aSymbol );
+    bool grabSymbols(std::vector< std::string > const &aDSONames);
+    void ungrabSymbols();
+
+private:
+    std::vector< SymbolToGrab > gSymbolsToGrab;
+
+    bool sSymsGrabbed = false;
+    apr_pool_t *sSymPADSOMemoryPool = nullptr;
+    std::vector<apr_dso_handle_t *> sLoadedLibraries;
+};
+
+extern SymbolGrabber gSymbolGrabber;
+#define LL_GRAB_SYM(REQUIRED, SYMBOL_NAME, RETURN, ...) RETURN (*ll##SYMBOL_NAME)(__VA_ARGS__) = nullptr; size_t gRegistered##SYMBOL_NAME = gSymbolGrabber.registerSymbol( { REQUIRED, #SYMBOL_NAME , (apr_dso_handle_sym_t*)&ll##SYMBOL_NAME} );
+
+#endif
 
 class MediaPluginBase
 {
@@ -46,7 +74,6 @@ public:
 	static void staticReceiveMessage(const char *message_string, void **user_data);
 
 protected:
-
    /** Plugin status. */
 	typedef enum 
 	{
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 410778114d..bbd2eb222a 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -10,18 +10,10 @@ include(Linking)
 include(PluginAPI)
 
 include(CEFPlugin)
-
+include(GLIB)
 
 ### media_plugin_cef
 
-if(NOT ADDRESS_SIZE EQUAL 32)
-  if(WINDOWS)
-    ##add_definitions(/FIXED:NO)
-  else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-    add_definitions(-fPIC)
-  endif(WINDOWS)
-endif(NOT ADDRESS_SIZE EQUAL 32)
-
 set(media_plugin_cef_SOURCE_FILES
     media_plugin_cef.cpp
     )
@@ -32,8 +24,21 @@ set(media_plugin_cef_HEADER_FILES
 
 # Select which VolumeCatcher implementation to use
 if (LINUX)
-  message(FATAL_ERROR "CEF plugin has been enabled for a Linux compile.\n"
-    "  Please create a volume_catcher implementation for this platform.")
+  foreach( PULSE_FILE pulse/introspect.h pulse/context.h pulse/subscribe.h pulse/glib-mainloop.h )
+    find_path( PULSE_FILE_${PULSE_FILE}_FOUND ${PULSE_FILE} NO_CACHE)
+    if( NOT PULSE_FILE_${PULSE_FILE}_FOUND )
+      message( "Looking for ${PULSE_FILE} ... not found")
+      message( FATAL_ERROR "Pulse header not found" )
+    else()
+      message( "Looking for ${PULSE_FILE} ... found")
+    endif()
+  endforeach()
+  message( "Building with linux volume catcher" )
+  set(LINUX_VOLUME_CATCHER linux_volume_catcher.cpp)
+
+  list(APPEND media_plugin_cef_SOURCE_FILES ${LINUX_VOLUME_CATCHER})
+  set(CMAKE_SHARED_LINKER_FLAGS  "-Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../../lib'")
+  list(APPEND media_plugin_cef_LINK_LIBRARIES llwindow )
 elseif (DARWIN)
   list(APPEND media_plugin_cef_SOURCE_FILES mac_volume_catcher_null.cpp)
   find_library(CORESERVICES_LIBRARY CoreServices)
@@ -60,6 +65,7 @@ add_library(media_plugin_cef
 target_link_libraries(media_plugin_cef
         media_plugin_base
         ll::cef
+        ll::glib_headers
 )
 
 if (WINDOWS)
diff --git a/indra/media_plugins/cef/linux_volume_catcher.cpp b/indra/media_plugins/cef/linux_volume_catcher.cpp
new file mode 100755
index 0000000000..9e6fe461a6
--- /dev/null
+++ b/indra/media_plugins/cef/linux_volume_catcher.cpp
@@ -0,0 +1,424 @@
+/** 
+ * @file linux_volume_catcher.cpp
+ * @brief A Linux-specific, PulseAudio-specific hack to detect and volume-adjust new audio sources
+ *
+ * @cond
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ * @endcond
+ */
+
+/*
+  The high-level design is as follows:
+  1) Connect to the PulseAudio daemon
+  2) Watch for the creation of new audio players connecting to the daemon (this includes ALSA clients running on the PulseAudio emulation layer, such as Flash plugins)
+  3) Examine any new audio player's PID to see if it belongs to our own process
+  4) If so, tell PA to adjust the volume of that audio player ('sink input' in PA parlance)
+  5) Keep a list of all living audio players that we care about, adjust the volumes of all of them when we get a new setVolume() call
+ */
+
+#include "linden_common.h"
+
+#include "volume_catcher.h"
+#include <set>
+#include <map>
+#include <iostream>
+extern "C" {
+#include <glib.h>
+#include <glib-object.h>
+
+#include <pulse/introspect.h>
+#include <pulse/context.h>
+#include <pulse/subscribe.h>
+#include <pulse/glib-mainloop.h> // There's no special reason why we want the *glib* PA mainloop, but the generic polling implementation seems broken.
+
+#include "apr_pools.h"
+#include "apr_dso.h"
+}
+
+#include "media_plugin_base.h"
+
+SymbolGrabber gSymbolGrabber;
+
+#include "linux_volume_catcher_pa_syms.inc"
+#include "linux_volume_catcher_paglib_syms.inc"
+////////////////////////////////////////////////////
+
+// PulseAudio requires a chain of callbacks with C linkage
+extern "C" {
+	void callback_discovered_sinkinput(pa_context *context, const pa_sink_input_info *i, int eol, void *userdata);
+	void callback_subscription_alert(pa_context *context, pa_subscription_event_type_t t, uint32_t index, void *userdata);
+	void callback_context_state(pa_context *context, void *userdata);
+}
+
+class VolumeCatcherImpl
+{
+public:
+	VolumeCatcherImpl();
+	~VolumeCatcherImpl();
+
+	void setVolume(F32 volume);
+	void pump(void);
+
+	// for internal use - can't be private because used from our C callbacks
+
+	bool loadsyms(std::string pulse_dso_name);
+	void init();
+	void cleanup();
+
+	void update_all_volumes(F32 volume);
+	void update_index_volume(U32 index, F32 volume);
+	void connected_okay();
+
+	std::set<U32> mSinkInputIndices;
+	std::map<U32,U32> mSinkInputNumChannels;
+	F32 mDesiredVolume;
+	pa_glib_mainloop *mMainloop;
+	pa_context *mPAContext;
+	bool mConnected;
+	bool mGotSyms;
+};
+
+VolumeCatcherImpl::VolumeCatcherImpl()
+	: mDesiredVolume(0.0f),
+	  mMainloop(nullptr),
+	  mPAContext(nullptr),
+	  mConnected(false),
+	  mGotSyms(false)
+{
+	init();
+}
+
+VolumeCatcherImpl::~VolumeCatcherImpl()
+{
+	cleanup();
+}
+
+bool VolumeCatcherImpl::loadsyms(std::string pulse_dso_name)
+{
+	//return grab_pa_syms({pulse_dso_name});
+    return gSymbolGrabber.grabSymbols( { pulse_dso_name }) ;
+}
+
+void VolumeCatcherImpl::init()
+{
+	// try to be as defensive as possible because PA's interface is a
+	// bit fragile and (for our purposes) we'd rather simply not function
+	// than crash
+
+	// we cheat and rely upon libpulse-mainloop-glib.so.0 to pull-in
+	// libpulse.so.0 - this isn't a great assumption, and the two DSOs should
+	// probably be loaded separately.  Our Linux DSO framework needs refactoring,
+	// we do this sort of thing a lot with practically identical logic...
+	mGotSyms = loadsyms("libpulse-mainloop-glib.so.0");
+	if (!mGotSyms) return;
+
+	mMainloop = llpa_glib_mainloop_new(g_main_context_default());
+	
+	if (mMainloop)
+	{
+		pa_mainloop_api *api = llpa_glib_mainloop_get_api(mMainloop);
+
+		if (api)
+		{
+			pa_proplist *proplist = llpa_proplist_new();
+
+			if (proplist)
+			{
+				llpa_proplist_sets(proplist, PA_PROP_APPLICATION_ICON_NAME, "multimedia-player");
+				llpa_proplist_sets(proplist, PA_PROP_APPLICATION_ID, "com.secondlife.viewer.mediaplugvoladjust");
+				llpa_proplist_sets(proplist, PA_PROP_APPLICATION_NAME, "SL Plugin Volume Adjuster");
+				llpa_proplist_sets(proplist, PA_PROP_APPLICATION_VERSION, "1");
+
+				// plain old pa_context_new() is broken!
+				mPAContext = llpa_context_new_with_proplist(api, nullptr, proplist);
+
+				llpa_proplist_free(proplist);
+			}
+		}
+	}
+
+	// Now we've set up a PA context and mainloop, try connecting the
+	// PA context to a PA daemon.
+	if (mPAContext)
+	{
+		llpa_context_set_state_callback(mPAContext, callback_context_state, this);
+		pa_context_flags_t cflags = (pa_context_flags)0; // maybe add PA_CONTEXT_NOAUTOSPAWN?
+		if (llpa_context_connect(mPAContext, nullptr, cflags, nullptr) >= 0)
+		{
+			// Okay!  We haven't definitely connected, but we
+			// haven't definitely failed yet.
+		}
+		else
+		{
+			// Failed to connect to PA manager... we'll leave
+			// things like that.  Perhaps we should try again later.
+		}
+	}
+}
+
+void VolumeCatcherImpl::cleanup()
+{
+	mConnected = false;
+
+	if (mGotSyms && mPAContext)
+	{
+		llpa_context_disconnect(mPAContext);
+		llpa_context_unref(mPAContext);
+	}
+
+	mPAContext = nullptr;
+
+	if (mGotSyms && mMainloop)
+		llpa_glib_mainloop_free(mMainloop);
+
+	mMainloop = nullptr;
+}
+
+void VolumeCatcherImpl::setVolume(F32 volume)
+{
+	mDesiredVolume = volume;
+	
+	if (!mGotSyms) return;
+
+	if (mConnected && mPAContext)
+	{
+		update_all_volumes(mDesiredVolume);
+	}
+
+	pump();
+}
+
+void VolumeCatcherImpl::pump()
+{
+	gboolean may_block = FALSE;
+	g_main_context_iteration(g_main_context_default(), may_block);
+}
+
+void VolumeCatcherImpl::connected_okay()
+{
+	pa_operation *op;
+
+	// fetch global list of existing sinkinputs
+	if ((op = llpa_context_get_sink_input_info_list(mPAContext,
+							callback_discovered_sinkinput,
+							this)))
+	{
+		llpa_operation_unref(op);
+	}
+
+	// subscribe to future global sinkinput changes
+	llpa_context_set_subscribe_callback(mPAContext,
+					    callback_subscription_alert,
+					    this);
+	if ((op = llpa_context_subscribe(mPAContext, (pa_subscription_mask_t)
+					 (PA_SUBSCRIPTION_MASK_SINK_INPUT),
+                                     nullptr, nullptr)))
+	{
+		llpa_operation_unref(op);
+	}
+}
+
+void VolumeCatcherImpl::update_all_volumes(F32 volume)
+{
+	for (std::set<U32>::iterator it = mSinkInputIndices.begin();
+	     it != mSinkInputIndices.end(); ++it)
+	{
+		update_index_volume(*it, volume);
+	}
+}
+
+void VolumeCatcherImpl::update_index_volume(U32 index, F32 volume)
+{
+	static pa_cvolume cvol;
+	llpa_cvolume_set(&cvol, mSinkInputNumChannels[index],
+			 llpa_sw_volume_from_linear(volume));
+	
+	pa_context *c = mPAContext;
+	uint32_t idx = index;
+	const pa_cvolume *cvolumep = &cvol;
+	pa_context_success_cb_t cb = nullptr; // okay as null
+	void *userdata = nullptr; // okay as null
+
+	pa_operation *op;
+	if ((op = llpa_context_set_sink_input_volume(c, idx, cvolumep, cb, userdata)))
+		llpa_operation_unref(op);
+}
+
+pid_t getParentPid( pid_t aPid )
+{
+	std::stringstream strm;
+	strm << "/proc/" << aPid << "/status";
+	std::ifstream in{ strm.str() };
+
+	if( !in.is_open() )
+		return 0;
+
+	pid_t res {0};
+	while( !in.eof() && res == 0 )
+	{
+		std::string line;
+		line.resize( 1024, 0 );
+		in.getline( &line[0], line.length() );	
+
+		auto i = line.find( "PPid:"  );
+		
+		if( i == std::string::npos )
+			continue;
+		
+		char const *pIn = line.c_str() + 5; // Skip over pid;
+		while( *pIn != 0 && isspace( *pIn ) )
+			   ++pIn;
+
+		if( *pIn )
+			res = atoll( pIn );
+	}
+ 	return res;
+}
+
+
+bool isPluginPid( pid_t aPid )
+{
+	auto myPid = getpid();
+
+	do
+	{
+		if( aPid == myPid )
+			return true;
+		aPid = getParentPid( aPid );
+	} while( aPid > 1 );
+
+	return false;
+}
+
+void callback_discovered_sinkinput(pa_context *context, const pa_sink_input_info *sii, int eol, void *userdata)
+{
+	VolumeCatcherImpl *impl = dynamic_cast<VolumeCatcherImpl*>((VolumeCatcherImpl*)userdata);
+	llassert(impl);
+
+	if (0 == eol)
+	{
+		pa_proplist *proplist = sii->proplist;
+		pid_t sinkpid = atoll(llpa_proplist_gets(proplist, PA_PROP_APPLICATION_PROCESS_ID));
+
+		if (isPluginPid( sinkpid )) // does the discovered sinkinput belong to this process?
+		{
+			bool is_new = (impl->mSinkInputIndices.find(sii->index) == impl->mSinkInputIndices.end());
+			
+			impl->mSinkInputIndices.insert(sii->index);
+			impl->mSinkInputNumChannels[sii->index] = sii->channel_map.channels;
+			
+			if (is_new)
+			{
+				// new!
+				impl->update_index_volume(sii->index, impl->mDesiredVolume);
+			}
+			else
+			{
+				// seen it already, do nothing.
+			}
+		}
+	}
+}
+
+void callback_subscription_alert(pa_context *context, pa_subscription_event_type_t t, uint32_t index, void *userdata)
+{
+	VolumeCatcherImpl *impl = dynamic_cast<VolumeCatcherImpl*>((VolumeCatcherImpl*)userdata);
+	llassert(impl);
+
+	switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK)
+	{
+        case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+			if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) ==  PA_SUBSCRIPTION_EVENT_REMOVE)
+			{
+				// forget this sinkinput, if we were caring about it
+				impl->mSinkInputIndices.erase(index);
+				impl->mSinkInputNumChannels.erase(index);
+			}
+			else if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW)
+			{
+				// ask for more info about this new sinkinput
+				pa_operation *op;
+				if ((op = llpa_context_get_sink_input_info(impl->mPAContext, index, callback_discovered_sinkinput, impl)))
+				{
+					llpa_operation_unref(op);
+				}
+			}
+			else
+			{
+				// property change on this sinkinput - we don't care.
+			}
+			break;
+		
+		default:;
+	}
+}
+
+void callback_context_state(pa_context *context, void *userdata)
+{
+	VolumeCatcherImpl *impl = dynamic_cast<VolumeCatcherImpl*>((VolumeCatcherImpl*)userdata);
+	llassert(impl);
+	
+	switch (llpa_context_get_state(context))
+	{
+	case PA_CONTEXT_READY:
+		impl->mConnected = true;
+		impl->connected_okay();
+		break;
+	case PA_CONTEXT_TERMINATED:
+		impl->mConnected = false;
+		break;
+	case PA_CONTEXT_FAILED:
+		impl->mConnected = false;
+		break;
+	default:;
+	}
+}
+
+/////////////////////////////////////////////////////
+
+VolumeCatcher::VolumeCatcher()
+{
+	pimpl = new VolumeCatcherImpl();
+}
+
+VolumeCatcher::~VolumeCatcher()
+{
+	delete pimpl;
+	pimpl = nullptr;
+}
+
+void VolumeCatcher::setVolume(F32 volume)
+{
+	llassert(pimpl);
+	pimpl->setVolume(volume);
+}
+
+void VolumeCatcher::setPan(F32 pan)
+{
+	// TODO: implement this (if possible)
+}
+
+void VolumeCatcher::pump()
+{
+	llassert(pimpl);
+	pimpl->pump();
+}
diff --git a/indra/media_plugins/cef/linux_volume_catcher_pa_syms.inc b/indra/media_plugins/cef/linux_volume_catcher_pa_syms.inc
new file mode 100755
index 0000000000..4533362e61
--- /dev/null
+++ b/indra/media_plugins/cef/linux_volume_catcher_pa_syms.inc
@@ -0,0 +1,21 @@
+// required symbols to grab
+LL_GRAB_SYM(true, pa_context_connect, int, pa_context *c, const char *server, pa_context_flags_t flags, const pa_spawn_api *api)
+LL_GRAB_SYM(true, pa_context_disconnect, void, pa_context *c)
+LL_GRAB_SYM(true, pa_context_get_sink_input_info, pa_operation*, pa_context *c, uint32_t idx, pa_sink_input_info_cb_t cb, void *userdata)
+LL_GRAB_SYM(true, pa_context_get_sink_input_info_list, pa_operation*, pa_context *c, pa_sink_input_info_cb_t cb, void *userdata)
+LL_GRAB_SYM(true, pa_context_get_state, pa_context_state_t, pa_context *c)
+LL_GRAB_SYM(true, pa_context_new_with_proplist, pa_context*, pa_mainloop_api *mainloop, const char *name, pa_proplist *proplist)
+LL_GRAB_SYM(true, pa_context_set_sink_input_volume, pa_operation*, pa_context *c, uint32_t idx, const pa_cvolume *volume, pa_context_success_cb_t cb, void *userdata)
+LL_GRAB_SYM(true, pa_context_set_state_callback, void, pa_context *c, pa_context_notify_cb_t cb, void *userdata)
+LL_GRAB_SYM(true, pa_context_set_subscribe_callback, void, pa_context *c, pa_context_subscribe_cb_t cb, void *userdata)
+LL_GRAB_SYM(true, pa_context_subscribe, pa_operation*, pa_context *c, pa_subscription_mask_t m, pa_context_success_cb_t cb, void *userdata)
+LL_GRAB_SYM(true, pa_context_unref, void, pa_context *c)
+LL_GRAB_SYM(true, pa_cvolume_set, pa_cvolume*, pa_cvolume *a, unsigned channels, pa_volume_t v)
+LL_GRAB_SYM(true, pa_operation_unref, void, pa_operation *o)
+LL_GRAB_SYM(true, pa_proplist_free, void, pa_proplist* p)
+LL_GRAB_SYM(true, pa_proplist_gets, const char*, pa_proplist *p, const char *key)
+LL_GRAB_SYM(true, pa_proplist_new, pa_proplist*, void)
+LL_GRAB_SYM(true, pa_proplist_sets, int, pa_proplist *p, const char *key, const char *value)
+LL_GRAB_SYM(true, pa_sw_volume_from_linear, pa_volume_t, double v)
+
+// optional symbols to grab
diff --git a/indra/media_plugins/cef/linux_volume_catcher_paglib_syms.inc b/indra/media_plugins/cef/linux_volume_catcher_paglib_syms.inc
new file mode 100755
index 0000000000..5fba60c188
--- /dev/null
+++ b/indra/media_plugins/cef/linux_volume_catcher_paglib_syms.inc
@@ -0,0 +1,6 @@
+// required symbols to grab
+LL_GRAB_SYM(true, pa_glib_mainloop_free, void, pa_glib_mainloop* g)
+LL_GRAB_SYM(true, pa_glib_mainloop_get_api, pa_mainloop_api*, pa_glib_mainloop* g)
+LL_GRAB_SYM(true, pa_glib_mainloop_new, pa_glib_mainloop *, GMainContext *c)
+
+// optional symbols to grab
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index 43d3a32e64..60d91753d0 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -886,7 +886,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
 
                 keyEvent(key_event, native_key_data);
 
-#elif LL_WINDOWS
+#else
 				std::string event = message_in.getValue("event");
 				LLSD native_key_data = message_in.getValueLLSD("native_key_data");
 
@@ -1050,6 +1050,28 @@ void MediaPluginCEF::keyEvent(dullahan::EKeyEvent key_event, LLSD native_key_dat
 
 	mCEFLib->nativeKeyboardEventWin(msg, wparam, lparam);
 #endif
+
+#if LL_LINUX
+
+	uint32_t native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());		// this is actually the SDL event.key.keysym.sym;
+	uint32_t native_virtual_key_win = (uint32_t)(native_key_data["virtual_key_win"].asInteger());
+	uint32_t native_modifiers = (uint32_t)(native_key_data["modifiers"].asInteger());
+
+	// only for non-printable keysyms, the actual text input is done in unicodeInput() below
+	if (native_virtual_key <= 0x1b || native_virtual_key >= 0x7f)
+	{
+		// set keypad flag, not sure if this even does anything
+		bool keypad = false;
+		if (native_virtual_key_win >= 0x60 && native_virtual_key_win <= 0x6f)
+		{
+			keypad = true;
+		}
+
+		// yes, we send native_virtual_key_win twice because native_virtual_key breaks it
+		mCEFLib->nativeKeyboardEventSDL2(key_event, native_virtual_key, native_modifiers, keypad);
+	}
+
+#endif // LL_LINUX
 };
 
 void MediaPluginCEF::unicodeInput(std::string event, LLSD native_key_data = LLSD::emptyMap())
@@ -1080,6 +1102,16 @@ void MediaPluginCEF::unicodeInput(std::string event, LLSD native_key_data = LLSD
 	U64 lparam = ll_U32_from_sd(native_key_data["l_param"]);
 	mCEFLib->nativeKeyboardEventWin(msg, wparam, lparam);
 #endif
+
+#if LL_LINUX
+
+	uint32_t native_scan_code = (uint32_t)(native_key_data["sdl_sym"].asInteger());
+	uint32_t native_virtual_key = (uint32_t)(native_key_data["virtual_key"].asInteger());
+	uint32_t native_modifiers = (uint32_t)(native_key_data["modifiers"].asInteger());
+
+	mCEFLib->nativeKeyboardEvent(dullahan::KE_KEY_DOWN, native_scan_code, native_virtual_key, native_modifiers);
+
+#endif // LL_LINUX
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt
index 7d3e7f663b..86e982fbb4 100644
--- a/indra/media_plugins/example/CMakeLists.txt
+++ b/indra/media_plugins/example/CMakeLists.txt
@@ -13,14 +13,6 @@ include(ExamplePlugin)
 
 ### media_plugin_example
 
-if(NOT ADDRESS_SIZE EQUAL 32)
-  if(WINDOWS)
-    ##add_definitions(/FIXED:NO)
-  else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-    add_definitions(-fPIC)
-  endif(WINDOWS)
-endif(NOT ADDRESS_SIZE EQUAL 32)
-
 set(media_plugin_example_SOURCE_FILES
     media_plugin_example.cpp
     )
diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt
deleted file mode 100644
index 38fc8201bf..0000000000
--- a/indra/media_plugins/gstreamer010/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- cmake -*-
-
-project(media_plugin_gstreamer010)
-
-include(00-Common)
-include(LLCommon)
-include(LLImage)
-include(LLMath)
-include(LLWindow)
-include(Linking)
-include(PluginAPI)
-include(OpenGL)
-
-include(GStreamer010Plugin)
-
-### media_plugin_gstreamer010
-
-if(NOT ADDRESS_SIZE EQUAL 32)
-  if(WINDOWS)
-    ##add_definitions(/FIXED:NO)
-  else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-    add_definitions(-fPIC)
-  endif(WINDOWS)
-endif(NOT ADDRESS_SIZE EQUAL 32)
-
-set(media_plugin_gstreamer010_SOURCE_FILES
-    media_plugin_gstreamer010.cpp
-    llmediaimplgstreamer_syms.cpp
-    llmediaimplgstreamervidplug.cpp
-    )
-
-set(media_plugin_gstreamer010_HEADER_FILES
-    llmediaimplgstreamervidplug.h
-    llmediaimplgstreamer_syms.h
-    llmediaimplgstreamertriviallogging.h
-    )
-
-add_library(media_plugin_gstreamer010
-    SHARED
-    ${media_plugin_gstreamer010_SOURCE_FILES}
-    )
-
-target_link_libraries(media_plugin_gstreamer010
-        media_plugin_base
-        ll::gstreamer
-  )
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h
deleted file mode 100644
index 6bc272c009..0000000000
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/** 
- * @file llmediaimplgstreamer.h
- * @author Tofu Linden
- * @brief implementation that supports media playback via GStreamer.
- *
- * @cond
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-// header guard
-#ifndef llmediaimplgstreamer_h
-#define llmediaimplgstreamer_h
-
-#if LL_GSTREAMER010_ENABLED
-
-extern "C" {
-#include <stdio.h>
-#include <gst/gst.h>
-
-#include "apr_pools.h"
-#include "apr_dso.h"
-}
-
-
-extern "C" {
-gboolean llmediaimplgstreamer_bus_callback (GstBus     *bus,
-					    GstMessage *message,
-					    gpointer    data);
-}
-
-#endif // LL_GSTREAMER010_ENABLED
-
-#endif // llmediaimplgstreamer_h
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
deleted file mode 100644
index 2e4baaa9eb..0000000000
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/** 
- * @file llmediaimplgstreamer_syms.cpp
- * @brief dynamic GStreamer symbol-grabbing code
- *
- * @cond
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-#if LL_GSTREAMER010_ENABLED
-
-#include <string>
-
-extern "C" {
-#include <gst/gst.h>
-
-#include "apr_pools.h"
-#include "apr_dso.h"
-}
-
-#include "llmediaimplgstreamertriviallogging.h"
-
-#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) RTN (*ll##GSTSYM)(__VA_ARGS__) = NULL
-#include "llmediaimplgstreamer_syms_raw.inc"
-#include "llmediaimplgstreamer_syms_rawv.inc"
-#undef LL_GST_SYM
-
-// a couple of stubs for disgusting reasons
-GstDebugCategory*
-ll_gst_debug_category_new(gchar *name, guint color, gchar *description)
-{
-	static GstDebugCategory dummy;
-	return &dummy;
-}
-void ll_gst_debug_register_funcptr(GstDebugFuncPtr func, gchar* ptrname)
-{
-}
-
-static bool sSymsGrabbed = false;
-static apr_pool_t *sSymGSTDSOMemoryPool = NULL;
-static apr_dso_handle_t *sSymGSTDSOHandleG = NULL;
-static apr_dso_handle_t *sSymGSTDSOHandleV = NULL;
-
-
-bool grab_gst_syms(std::string gst_dso_name,
-		   std::string gst_dso_name_vid)
-{
-	if (sSymsGrabbed)
-	{
-		// already have grabbed good syms
-		return TRUE;
-	}
-
-	bool sym_error = false;
-	bool rtn = false;
-	apr_status_t rv;
-	apr_dso_handle_t *sSymGSTDSOHandle = NULL;
-
-#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) do{rv = apr_dso_sym((apr_dso_handle_sym_t*)&ll##GSTSYM, sSymGSTDSOHandle, #GSTSYM); if (rv != APR_SUCCESS) {INFOMSG("Failed to grab symbol: %s", #GSTSYM); if (REQ) sym_error = true;} else DEBUGMSG("grabbed symbol: %s from %p", #GSTSYM, (void*)ll##GSTSYM);}while(0)
-
-	//attempt to load the shared libraries
-	apr_pool_create(&sSymGSTDSOMemoryPool, NULL);
-  
-	if ( APR_SUCCESS == (rv = apr_dso_load(&sSymGSTDSOHandle,
-					       gst_dso_name.c_str(),
-					       sSymGSTDSOMemoryPool) ))
-	{
-		INFOMSG("Found DSO: %s", gst_dso_name.c_str());
-#include "llmediaimplgstreamer_syms_raw.inc"
-      
-		if ( sSymGSTDSOHandle )
-		{
-			sSymGSTDSOHandleG = sSymGSTDSOHandle;
-			sSymGSTDSOHandle = NULL;
-		}
-      
-		if ( APR_SUCCESS ==
-		     (rv = apr_dso_load(&sSymGSTDSOHandle,
-					gst_dso_name_vid.c_str(),
-					sSymGSTDSOMemoryPool) ))
-		{
-			INFOMSG("Found DSO: %s", gst_dso_name_vid.c_str());
-#include "llmediaimplgstreamer_syms_rawv.inc"
-			rtn = !sym_error;
-		}
-		else
-		{
-			INFOMSG("Couldn't load DSO: %s", gst_dso_name_vid.c_str());
-			rtn = false; // failure
-		}
-	}
-	else
-	{
-		INFOMSG("Couldn't load DSO: %s", gst_dso_name.c_str());
-		rtn = false; // failure
-	}
-
-	if (sym_error)
-	{
-		WARNMSG("Failed to find necessary symbols in GStreamer libraries.");
-	}
-	
-	if ( sSymGSTDSOHandle )
-	{
-		sSymGSTDSOHandleV = sSymGSTDSOHandle;
-		sSymGSTDSOHandle = NULL;
-	}
-#undef LL_GST_SYM
-
-	sSymsGrabbed = !!rtn;
-	return rtn;
-}
-
-
-void ungrab_gst_syms()
-{ 
-	// should be safe to call regardless of whether we've
-	// actually grabbed syms.
-
-	if ( sSymGSTDSOHandleG )
-	{
-		apr_dso_unload(sSymGSTDSOHandleG);
-		sSymGSTDSOHandleG = NULL;
-	}
-	
-	if ( sSymGSTDSOHandleV )
-	{
-		apr_dso_unload(sSymGSTDSOHandleV);
-		sSymGSTDSOHandleV = NULL;
-	}
-	
-	if ( sSymGSTDSOMemoryPool )
-	{
-		apr_pool_destroy(sSymGSTDSOMemoryPool);
-		sSymGSTDSOMemoryPool = NULL;
-	}
-	
-	// NULL-out all of the symbols we'd grabbed
-#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) do{ll##GSTSYM = NULL;}while(0)
-#include "llmediaimplgstreamer_syms_raw.inc"
-#include "llmediaimplgstreamer_syms_rawv.inc"
-#undef LL_GST_SYM
-
-	sSymsGrabbed = false;
-}
-
-
-#endif // LL_GSTREAMER010_ENABLED
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
deleted file mode 100644
index d1559089c8..0000000000
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/** 
- * @file llmediaimplgstreamer_syms.h
- * @brief dynamic GStreamer symbol-grabbing code
- *
- * @cond
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-#include "linden_common.h"
-
-#if LL_GSTREAMER010_ENABLED
-
-extern "C" {
-#include <gst/gst.h>
-}
-
-bool grab_gst_syms(std::string gst_dso_name,
-		   std::string gst_dso_name_vid);
-void ungrab_gst_syms();
-
-#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) extern RTN (*ll##GSTSYM)(__VA_ARGS__)
-#include "llmediaimplgstreamer_syms_raw.inc"
-#include "llmediaimplgstreamer_syms_rawv.inc"
-#undef LL_GST_SYM
-
-// regrettable hacks to give us better runtime compatibility with older systems
-#define llg_return_if_fail(COND) do{if (!(COND)) return;}while(0)
-#define llg_return_val_if_fail(COND,V) do{if (!(COND)) return V;}while(0)
-
-// regrettable hacks because GStreamer was not designed for runtime loading
-#undef GST_TYPE_MESSAGE
-#define GST_TYPE_MESSAGE (llgst_message_get_type())
-#undef GST_TYPE_OBJECT
-#define GST_TYPE_OBJECT (llgst_object_get_type())
-#undef GST_TYPE_PIPELINE
-#define GST_TYPE_PIPELINE (llgst_pipeline_get_type())
-#undef GST_TYPE_ELEMENT
-#define GST_TYPE_ELEMENT (llgst_element_get_type())
-#undef GST_TYPE_VIDEO_SINK
-#define GST_TYPE_VIDEO_SINK (llgst_video_sink_get_type())
-// more regrettable hacks to stub-out these .h-exposed GStreamer internals
-void ll_gst_debug_register_funcptr(GstDebugFuncPtr func, gchar* ptrname);
-#undef _gst_debug_register_funcptr
-#define _gst_debug_register_funcptr ll_gst_debug_register_funcptr
-GstDebugCategory* ll_gst_debug_category_new(gchar *name, guint color, gchar *description);
-#undef _gst_debug_category_new
-#define _gst_debug_category_new ll_gst_debug_category_new
-#undef __gst_debug_enabled
-#define __gst_debug_enabled (0)
-
-// more hacks
-#define LLGST_MESSAGE_TYPE_NAME(M) (llgst_message_type_get_name(GST_MESSAGE_TYPE(M)))
-
-#endif // LL_GSTREAMER010_ENABLED
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc
deleted file mode 100644
index b33e59363d..0000000000
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_raw.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// required symbols to grab
-LL_GST_SYM(true, gst_pad_peer_accept_caps, gboolean, GstPad *pad, GstCaps *caps);
-LL_GST_SYM(true, gst_buffer_new, GstBuffer*, void);
-LL_GST_SYM(true, gst_buffer_set_caps, void, GstBuffer*, GstCaps *);
-LL_GST_SYM(true, gst_structure_set_value, void, GstStructure *, const gchar *, const GValue*);
-LL_GST_SYM(true, gst_init_check, gboolean, int *argc, char **argv[], GError ** err);
-LL_GST_SYM(true, gst_message_get_type, GType, void);
-LL_GST_SYM(true, gst_message_type_get_name, const gchar*, GstMessageType type);
-LL_GST_SYM(true, gst_message_parse_error, void, GstMessage *message, GError **gerror, gchar **debug);
-LL_GST_SYM(true, gst_message_parse_warning, void, GstMessage *message, GError **gerror, gchar **debug);
-LL_GST_SYM(true, gst_message_parse_state_changed, void, GstMessage *message, GstState *oldstate, GstState *newstate, GstState *pending);
-LL_GST_SYM(true, gst_element_set_state, GstStateChangeReturn, GstElement *element, GstState state);
-LL_GST_SYM(true, gst_object_unref, void, gpointer object);
-LL_GST_SYM(true, gst_object_get_type, GType, void);
-LL_GST_SYM(true, gst_pipeline_get_type, GType, void);
-LL_GST_SYM(true, gst_pipeline_get_bus, GstBus*, GstPipeline *pipeline);
-LL_GST_SYM(true, gst_bus_add_watch, guint, GstBus * bus, GstBusFunc func, gpointer user_data);
-LL_GST_SYM(true, gst_element_factory_make, GstElement*, const gchar *factoryname, const gchar *name);
-LL_GST_SYM(true, gst_element_get_type, GType, void);
-LL_GST_SYM(true, gst_static_pad_template_get, GstPadTemplate*, GstStaticPadTemplate *pad_template);
-LL_GST_SYM(true, gst_element_class_add_pad_template, void, GstElementClass *klass, GstPadTemplate *temp);
-LL_GST_SYM(true, gst_element_class_set_details, void, GstElementClass *klass, const GstElementDetails *details);
-LL_GST_SYM(true, gst_caps_unref, void, GstCaps* caps);
-LL_GST_SYM(true, gst_caps_ref, GstCaps *, GstCaps* caps);
-//LL_GST_SYM(true, gst_caps_is_empty, gboolean, const GstCaps *caps);
-LL_GST_SYM(true, gst_caps_from_string, GstCaps *, const gchar *string);
-LL_GST_SYM(true, gst_caps_replace, void, GstCaps **caps, GstCaps *newcaps);
-LL_GST_SYM(true, gst_caps_get_structure, GstStructure *, const GstCaps *caps, guint index);
-LL_GST_SYM(true, gst_caps_copy, GstCaps *, const GstCaps * caps);
-//LL_GST_SYM(true, gst_caps_intersect, GstCaps *, const GstCaps *caps1, const GstCaps *caps2);
-LL_GST_SYM(true, gst_element_register, gboolean, GstPlugin *plugin, const gchar *name, guint rank, GType type);
-LL_GST_SYM(true, _gst_plugin_register_static, void, GstPluginDesc *desc);
-LL_GST_SYM(true, gst_structure_get_int, gboolean, const GstStructure *structure, const gchar *fieldname, gint *value);
-LL_GST_SYM(true, gst_structure_get_value, G_CONST_RETURN GValue *, const GstStructure *structure, const gchar *fieldname);
-LL_GST_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value);
-LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value);
-LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure);
-LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64);
-
-// optional symbols to grab
-LL_GST_SYM(false, gst_registry_fork_set_enabled, void, gboolean enabled);
-LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled);
-LL_GST_SYM(false, gst_message_parse_buffering, void, GstMessage *message, gint *percent);
-LL_GST_SYM(false, gst_message_parse_info, void, GstMessage *message, GError **gerror, gchar **debug);
-LL_GST_SYM(false, gst_element_query_position, gboolean, GstElement *element, GstFormat *format, gint64 *cur);
-LL_GST_SYM(false, gst_version, void, guint *major, guint *minor, guint *micro, guint *nano);
-
-// GStreamer 'internal' symbols which may not be visible in some runtimes but are still used in expanded GStreamer header macros - yuck!  We'll substitute our own stubs for these.
-//LL_GST_SYM(true, _gst_debug_register_funcptr, void, GstDebugFuncPtr func, gchar* ptrname);
-//LL_GST_SYM(true, _gst_debug_category_new, GstDebugCategory *, gchar *name, guint color, gchar *description);
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc b/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc
deleted file mode 100644
index 14fbcb48b9..0000000000
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms_rawv.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-// required symbols to grab
-LL_GST_SYM(true, gst_video_sink_get_type, GType, void);
-
-// optional symbols to grab
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
deleted file mode 100644
index e7b31bec94..0000000000
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * @file llmediaimplgstreamertriviallogging.h
- * @brief minimal logging utilities.
- *
- * @cond
- * $LicenseInfo:firstyear=2009&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-#ifndef __LLMEDIAIMPLGSTREAMERTRIVIALLOGGING_H__
-#define __LLMEDIAIMPLGSTREAMERTRIVIALLOGGING_H__
-
-#include <cstdio>
-
-extern "C" {
-#include <sys/types.h>
-#include <unistd.h>
-}
-
-/////////////////////////////////////////////////////////////////////////
-// Debug/Info/Warning macros.
-#define MSGMODULEFOO "(media plugin)"
-#define STDERRMSG(...) do{\
-    fprintf(stderr, " pid:%d: ", (int)getpid());\
-    fprintf(stderr, MSGMODULEFOO " %s:%d: ", __FUNCTION__, __LINE__);\
-    fprintf(stderr, __VA_ARGS__);\
-    fputc('\n',stderr);\
-  }while(0)
-#define NULLMSG(...) do{}while(0)
-
-#define DEBUGMSG NULLMSG
-#define INFOMSG  STDERRMSG
-#define WARNMSG  STDERRMSG
-/////////////////////////////////////////////////////////////////////////
-
-#endif /* __LLMEDIAIMPLGSTREAMERTRIVIALLOGGING_H__ */
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
deleted file mode 100644
index 932aaffa1b..0000000000
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ /dev/null
@@ -1,526 +0,0 @@
-/**
- * @file llmediaimplgstreamervidplug.h
- * @brief Video-consuming static GStreamer plugin for gst-to-LLMediaImpl
- *
- * @cond
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-#if LL_GSTREAMER010_ENABLED
-
-#include "linden_common.h"
-
-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideosink.h>
-
-#include "llmediaimplgstreamer_syms.h"
-#include "llmediaimplgstreamertriviallogging.h"
-
-#include "llmediaimplgstreamervidplug.h"
-
-
-GST_DEBUG_CATEGORY_STATIC (gst_slvideo_debug);
-#define GST_CAT_DEFAULT gst_slvideo_debug
-
-
-#define SLV_SIZECAPS ", width=(int)[1,2048], height=(int)[1,2048] "
-#define SLV_ALLCAPS GST_VIDEO_CAPS_RGBx SLV_SIZECAPS
-
-static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE (
-    (gchar*)"sink",
-    GST_PAD_SINK,
-    GST_PAD_ALWAYS,
-    GST_STATIC_CAPS (SLV_ALLCAPS)
-    );
-
-GST_BOILERPLATE (GstSLVideo, gst_slvideo, GstVideoSink,
-    GST_TYPE_VIDEO_SINK);
-
-static void gst_slvideo_set_property (GObject * object, guint prop_id,
-				      const GValue * value,
-				      GParamSpec * pspec);
-static void gst_slvideo_get_property (GObject * object, guint prop_id,
-				      GValue * value, GParamSpec * pspec);
-
-static void
-gst_slvideo_base_init (gpointer gclass)
-{
-	static GstElementDetails element_details = {
-		(gchar*)"PluginTemplate",
-		(gchar*)"Generic/PluginTemplate",
-		(gchar*)"Generic Template Element",
-		(gchar*)"Linden Lab"
-	};
-	GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
-	
-	llgst_element_class_add_pad_template (element_class,
-			      llgst_static_pad_template_get (&sink_factory));
-	llgst_element_class_set_details (element_class, &element_details);
-}
-
-
-static void
-gst_slvideo_finalize (GObject * object)
-{
-	GstSLVideo *slvideo;
-	slvideo = GST_SLVIDEO (object);
-	if (slvideo->caps)
-	{
-		llgst_caps_unref(slvideo->caps);
-	}
-
-	G_OBJECT_CLASS(parent_class)->finalize (object);
-}
-
-
-static GstFlowReturn
-gst_slvideo_show_frame (GstBaseSink * bsink, GstBuffer * buf)
-{
-	GstSLVideo *slvideo;
-	llg_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
-	
-	slvideo = GST_SLVIDEO(bsink);
-	
-	DEBUGMSG("transferring a frame of %dx%d <- %p (%d)",
-		 slvideo->width, slvideo->height, GST_BUFFER_DATA(buf),
-		 slvideo->format);
-
-	if (GST_BUFFER_DATA(buf))
-	{
-		// copy frame and frame info into neutral territory
-		GST_OBJECT_LOCK(slvideo);
-		slvideo->retained_frame_ready = TRUE;
-		slvideo->retained_frame_width = slvideo->width;
-		slvideo->retained_frame_height = slvideo->height;
-		slvideo->retained_frame_format = slvideo->format;
-		int rowbytes = 
-			SLVPixelFormatBytes[slvideo->retained_frame_format] *
-			slvideo->retained_frame_width;
-		int needbytes = rowbytes * slvideo->retained_frame_width;
-		// resize retained frame hunk only if necessary
-		if (needbytes != slvideo->retained_frame_allocbytes)
-		{
-			delete[] slvideo->retained_frame_data;
-			slvideo->retained_frame_data = new unsigned char[needbytes];
-			slvideo->retained_frame_allocbytes = needbytes;
-			
-		}
-		// copy the actual frame data to neutral territory -
-		// flipped, for GL reasons
-		for (int ypos=0; ypos<slvideo->height; ++ypos)
-		{
-			memcpy(&slvideo->retained_frame_data[(slvideo->height-1-ypos)*rowbytes],
-			       &(((unsigned char*)GST_BUFFER_DATA(buf))[ypos*rowbytes]),
-			       rowbytes);
-		}
-		// done with the shared data
-		GST_OBJECT_UNLOCK(slvideo);
-	}
-
-	return GST_FLOW_OK;
-}
-
-
-static GstStateChangeReturn
-gst_slvideo_change_state(GstElement * element, GstStateChange transition)
-{
-	GstSLVideo *slvideo;
-	GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
-	
-	slvideo = GST_SLVIDEO (element);
-
-	switch (transition) {
-	case GST_STATE_CHANGE_NULL_TO_READY:
-		break;
-	case GST_STATE_CHANGE_READY_TO_PAUSED:
-		break;
-	case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
-		break;
-	default:
-		break;
-	}
-
-	ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-	if (ret == GST_STATE_CHANGE_FAILURE)
-		return ret;
-
-	switch (transition) {
-	case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-		break;
-	case GST_STATE_CHANGE_PAUSED_TO_READY:
-		slvideo->fps_n = 0;
-		slvideo->fps_d = 1;
-		GST_VIDEO_SINK_WIDTH(slvideo) = 0;
-		GST_VIDEO_SINK_HEIGHT(slvideo) = 0;
-		break;
-	case GST_STATE_CHANGE_READY_TO_NULL:
-		break;
-	default:
-		break;
-	}
-
-	return ret;
-}
-
-
-static GstCaps *
-gst_slvideo_get_caps (GstBaseSink * bsink)
-{
-	GstSLVideo *slvideo;
-	slvideo = GST_SLVIDEO(bsink);
-	
-	return llgst_caps_ref (slvideo->caps);
-}
-
-
-/* this function handles the link with other elements */
-static gboolean
-gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
-{
-	GstSLVideo *filter;
-	GstStructure *structure;
-	
-	GST_DEBUG ("set caps with %" GST_PTR_FORMAT, caps);
-	
-	filter = GST_SLVIDEO(bsink);
-
-	int width, height;
-	gboolean ret;
-	const GValue *fps;
-	const GValue *par;
-	structure = llgst_caps_get_structure (caps, 0);
-	ret = llgst_structure_get_int (structure, "width", &width);
-	ret = ret && llgst_structure_get_int (structure, "height", &height);
-	fps = llgst_structure_get_value (structure, "framerate");
-	ret = ret && (fps != NULL);
-	par = llgst_structure_get_value (structure, "pixel-aspect-ratio");
-	if (!ret)
-		return FALSE;
-
-	INFOMSG("** filter caps set with width=%d, height=%d", width, height);
-
-	GST_OBJECT_LOCK(filter);
-
-	filter->width = width;
-	filter->height = height;
-
-	filter->fps_n = llgst_value_get_fraction_numerator(fps);
-	filter->fps_d = llgst_value_get_fraction_denominator(fps);
-	if (par)
-	{
-		filter->par_n = llgst_value_get_fraction_numerator(par);
-		filter->par_d = llgst_value_get_fraction_denominator(par);
-	}
-	else
-	{
-		filter->par_n = 1;
-		filter->par_d = 1;
-	}
-	GST_VIDEO_SINK_WIDTH(filter) = width;
-	GST_VIDEO_SINK_HEIGHT(filter) = height;
-	
-	// crufty lump - we *always* accept *only* RGBX now.
-	/*
-	filter->format = SLV_PF_UNKNOWN;
-	if (0 == strcmp(llgst_structure_get_name(structure),
-			"video/x-raw-rgb"))
-	{
-		int red_mask;
-		int green_mask;
-		int blue_mask;
-		llgst_structure_get_int(structure, "red_mask", &red_mask);
-		llgst_structure_get_int(structure, "green_mask", &green_mask);
-		llgst_structure_get_int(structure, "blue_mask", &blue_mask);
-		if ((unsigned int)red_mask   == 0xFF000000 &&
-		    (unsigned int)green_mask == 0x00FF0000 &&
-		    (unsigned int)blue_mask  == 0x0000FF00)
-		{
-			filter->format = SLV_PF_RGBX;
-			//fprintf(stderr, "\n\nPIXEL FORMAT RGB\n\n");
-		} else if ((unsigned int)red_mask   == 0x0000FF00 &&
-			   (unsigned int)green_mask == 0x00FF0000 &&
-			   (unsigned int)blue_mask  == 0xFF000000)
-		{
-			filter->format = SLV_PF_BGRX;
-			//fprintf(stderr, "\n\nPIXEL FORMAT BGR\n\n");
-		}
-		}*/
-	
-	filter->format = SLV_PF_RGBX;
-
-	GST_OBJECT_UNLOCK(filter);
-
-	return TRUE;
-}
-
-
-static gboolean
-gst_slvideo_start (GstBaseSink * bsink)
-{
-	gboolean ret = TRUE;
-	
-	GST_SLVIDEO(bsink);
-
-	return ret;
-}
-
-static gboolean
-gst_slvideo_stop (GstBaseSink * bsink)
-{
-	GstSLVideo *slvideo;
-	slvideo = GST_SLVIDEO(bsink);
-
-	// free-up retained frame buffer
-	GST_OBJECT_LOCK(slvideo);
-	slvideo->retained_frame_ready = FALSE;
-	delete[] slvideo->retained_frame_data;
-	slvideo->retained_frame_data = NULL;
-	slvideo->retained_frame_allocbytes = 0;
-	GST_OBJECT_UNLOCK(slvideo);
-
-	return TRUE;
-}
-
-
-static GstFlowReturn
-gst_slvideo_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
-			  GstCaps * caps, GstBuffer ** buf)
-{
-	gint width, height;
-	GstStructure *structure = NULL;
-	GstSLVideo *slvideo;
-	slvideo = GST_SLVIDEO(bsink);
-
-	// caps == requested caps
-	// we can ignore these and reverse-negotiate our preferred dimensions with
-	// the peer if we like - we need to do this to obey dynamic resize requests
-	// flowing in from the app.
-	structure = llgst_caps_get_structure (caps, 0);
-	if (!llgst_structure_get_int(structure, "width", &width) ||
-	    !llgst_structure_get_int(structure, "height", &height))
-	{
-		GST_WARNING_OBJECT (slvideo, "no width/height in caps %" GST_PTR_FORMAT, caps);
-		return GST_FLOW_NOT_NEGOTIATED;
-	}
-
-	GstBuffer *newbuf = llgst_buffer_new();
-	bool made_bufferdata_ptr = false;
-#define MAXDEPTHHACK 4
-	
-	GST_OBJECT_LOCK(slvideo);
-	if (slvideo->resize_forced_always) // app is giving us a fixed size to work with
-	{
-		gint slwantwidth, slwantheight;
-		slwantwidth = slvideo->resize_try_width;
-		slwantheight = slvideo->resize_try_height;
-	
-		if (slwantwidth != width ||
-		    slwantheight != height)
-		{
-			// don't like requested caps, we will issue our own suggestion - copy
-			// the requested caps but substitute our own width and height and see
-			// if our peer is happy with that.
-		
-			GstCaps *desired_caps;
-			GstStructure *desired_struct;
-			desired_caps = llgst_caps_copy (caps);
-			desired_struct = llgst_caps_get_structure (desired_caps, 0);
-			
-			GValue value = {0};
-			g_value_init(&value, G_TYPE_INT);
-			g_value_set_int(&value, slwantwidth);
-			llgst_structure_set_value (desired_struct, "width", &value);
-			g_value_unset(&value);
-			g_value_init(&value, G_TYPE_INT);
-			g_value_set_int(&value, slwantheight);
-			llgst_structure_set_value (desired_struct, "height", &value);
-			
-			if (llgst_pad_peer_accept_caps (GST_VIDEO_SINK_PAD (slvideo),
-							desired_caps))
-			{
-				// todo: re-use buffers from a pool?
-				// todo: set MALLOCDATA to null, set DATA to point straight to shm?
-				
-				// peer likes our cap suggestion
-				DEBUGMSG("peer loves us :)");
-				GST_BUFFER_SIZE(newbuf) = slwantwidth * slwantheight * MAXDEPTHHACK;
-				GST_BUFFER_MALLOCDATA(newbuf) = (guint8*)g_malloc(GST_BUFFER_SIZE(newbuf));
-				GST_BUFFER_DATA(newbuf) = GST_BUFFER_MALLOCDATA(newbuf);
-				llgst_buffer_set_caps (GST_BUFFER_CAST(newbuf), desired_caps);
-
-				made_bufferdata_ptr = true;
-			} else {
-				// peer hates our cap suggestion
-				INFOMSG("peer hates us :(");
-				llgst_caps_unref(desired_caps);
-			}
-		}
-	}
-
-	GST_OBJECT_UNLOCK(slvideo);
-
-	if (!made_bufferdata_ptr) // need to fallback to malloc at original size
-	{
-		GST_BUFFER_SIZE(newbuf) = width * height * MAXDEPTHHACK;
-		GST_BUFFER_MALLOCDATA(newbuf) = (guint8*)g_malloc(GST_BUFFER_SIZE(newbuf));
-		GST_BUFFER_DATA(newbuf) = GST_BUFFER_MALLOCDATA(newbuf);
-		llgst_buffer_set_caps (GST_BUFFER_CAST(newbuf), caps);
-	}
-
-	*buf = GST_BUFFER_CAST(newbuf);
-
-	return GST_FLOW_OK;
-}
-
-
-/* initialize the plugin's class */
-static void
-gst_slvideo_class_init (GstSLVideoClass * klass)
-{
-	GObjectClass *gobject_class;
-	GstElementClass *gstelement_class;
-	GstBaseSinkClass *gstbasesink_class;
-	
-	gobject_class = (GObjectClass *) klass;
-	gstelement_class = (GstElementClass *) klass;
-	gstbasesink_class = (GstBaseSinkClass *) klass;
-	
-	gobject_class->finalize = gst_slvideo_finalize;
-	gobject_class->set_property = gst_slvideo_set_property;
-	gobject_class->get_property = gst_slvideo_get_property;
-	
-	gstelement_class->change_state = gst_slvideo_change_state;
-	
-#define LLGST_DEBUG_FUNCPTR(p) (p)
-	gstbasesink_class->get_caps = LLGST_DEBUG_FUNCPTR (gst_slvideo_get_caps);
-	gstbasesink_class->set_caps = LLGST_DEBUG_FUNCPTR( gst_slvideo_set_caps);
-	gstbasesink_class->buffer_alloc=LLGST_DEBUG_FUNCPTR(gst_slvideo_buffer_alloc);
-	//gstbasesink_class->get_times = LLGST_DEBUG_FUNCPTR (gst_slvideo_get_times);
-	gstbasesink_class->preroll = LLGST_DEBUG_FUNCPTR (gst_slvideo_show_frame);
-	gstbasesink_class->render = LLGST_DEBUG_FUNCPTR (gst_slvideo_show_frame);
-	
-	gstbasesink_class->start = LLGST_DEBUG_FUNCPTR (gst_slvideo_start);
-	gstbasesink_class->stop = LLGST_DEBUG_FUNCPTR (gst_slvideo_stop);
-	
-	//	gstbasesink_class->unlock = LLGST_DEBUG_FUNCPTR (gst_slvideo_unlock);
-#undef LLGST_DEBUG_FUNCPTR
-}
-
-
-/* initialize the new element
- * instantiate pads and add them to element
- * set functions
- * initialize structure
- */
-static void
-gst_slvideo_init (GstSLVideo * filter,
-		  GstSLVideoClass * gclass)
-{
-	filter->caps = NULL;
-	filter->width = -1;
-	filter->height = -1;
-
-	// this is the info we share with the client app
-	GST_OBJECT_LOCK(filter);
-	filter->retained_frame_ready = FALSE;
-	filter->retained_frame_data = NULL;
-	filter->retained_frame_allocbytes = 0;
-	filter->retained_frame_width = filter->width;
-	filter->retained_frame_height = filter->height;
-	filter->retained_frame_format = SLV_PF_UNKNOWN;
-	GstCaps *caps = llgst_caps_from_string (SLV_ALLCAPS);
-	llgst_caps_replace (&filter->caps, caps);
-	filter->resize_forced_always = false;
-	filter->resize_try_width = -1;
-	filter->resize_try_height = -1;
-	GST_OBJECT_UNLOCK(filter);
-}
-
-static void
-gst_slvideo_set_property (GObject * object, guint prop_id,
-			  const GValue * value, GParamSpec * pspec)
-{
-	llg_return_if_fail (GST_IS_SLVIDEO (object));
-	
-	switch (prop_id) {
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-gst_slvideo_get_property (GObject * object, guint prop_id,
-			  GValue * value, GParamSpec * pspec)
-{
-	llg_return_if_fail (GST_IS_SLVIDEO (object));
-
-	switch (prop_id) {
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
-}
-
-
-/* entry point to initialize the plug-in
- * initialize the plug-in itself
- * register the element factories and pad templates
- * register the features
- */
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-	DEBUGMSG("PLUGIN INIT");
-
-	GST_DEBUG_CATEGORY_INIT (gst_slvideo_debug, (gchar*)"private-slvideo-plugin",
-				 0, (gchar*)"Second Life Video Sink");
-
-	return llgst_element_register (plugin, "private-slvideo",
-				       GST_RANK_NONE, GST_TYPE_SLVIDEO);
-}
-
-/* this is the structure that gstreamer looks for to register plugins
- */
-/* NOTE: Can't rely upon GST_PLUGIN_DEFINE_STATIC to self-register, since
-   some g++ versions buggily avoid __attribute__((constructor)) functions -
-   so we provide an explicit plugin init function.
- */
-#define PACKAGE (gchar*)"packagehack"
-// this macro quietly refers to PACKAGE internally
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-		   GST_VERSION_MINOR,
-		   (gchar*)"private-slvideoplugin", 
-		   (gchar*)"SL Video sink plugin",
-		   plugin_init, (gchar*)"1.0", (gchar*)"LGPL",
-		   (gchar*)"Second Life",
-		   (gchar*)"http://www.secondlife.com/");
-#undef PACKAGE
-void gst_slvideo_init_class (void)
-{
-	ll_gst_plugin_register_static (&gst_plugin_desc);
-	DEBUGMSG("CLASS INIT");
-}
-
-#endif // LL_GSTREAMER010_ENABLED
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
deleted file mode 100644
index 29d65fa4e9..0000000000
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * @file llmediaimplgstreamervidplug.h
- * @brief Video-consuming static GStreamer plugin for gst-to-LLMediaImpl
- *
- * @cond
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-#ifndef __GST_SLVIDEO_H__
-#define __GST_SLVIDEO_H__
-
-#if LL_GSTREAMER010_ENABLED
-
-extern "C" {
-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/video/gstvideosink.h>
-}
-
-G_BEGIN_DECLS
-
-/* #defines don't like whitespacey bits */
-#define GST_TYPE_SLVIDEO \
-  (gst_slvideo_get_type())
-#define GST_SLVIDEO(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SLVIDEO,GstSLVideo))
-#define GST_SLVIDEO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SLVIDEO,GstSLVideoClass))
-#define GST_IS_SLVIDEO(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SLVIDEO))
-#define GST_IS_SLVIDEO_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SLVIDEO))
-
-typedef struct _GstSLVideo      GstSLVideo;
-typedef struct _GstSLVideoClass GstSLVideoClass;
-
-typedef enum {
-	SLV_PF_UNKNOWN = 0,
-	SLV_PF_RGBX    = 1,
-	SLV_PF_BGRX    = 2,
-	SLV__END       = 3
-} SLVPixelFormat;
-const int SLVPixelFormatBytes[SLV__END] = {1, 4, 4};
-
-struct _GstSLVideo
-{
-	GstVideoSink video_sink;
-
-	GstCaps *caps;
-
-	int fps_n, fps_d;
-	int par_n, par_d;
-	int height, width;
-	SLVPixelFormat format;
-
-	// SHARED WITH APPLICATION:
-	// Access to the following should be protected by GST_OBJECT_LOCK() on
-	// the GstSLVideo object, and should be totally consistent upon UNLOCK
-	// (i.e. all written at once to reflect the current retained frame info
-	// when the retained frame is updated.)
-	bool retained_frame_ready; // new frame ready since flag last reset. (*TODO: could get the writer to wait on a semaphore instead of having the reader poll, potentially making dropped frames somewhat cheaper.)
-	unsigned char*  retained_frame_data;
-	int retained_frame_allocbytes;
-	int retained_frame_width, retained_frame_height;
-	SLVPixelFormat retained_frame_format;
-	// sticky resize info
-	bool resize_forced_always;
-	int resize_try_width;
-	int resize_try_height;
-};
-
-struct _GstSLVideoClass 
-{
-	GstVideoSinkClass parent_class;
-};
-
-GType gst_slvideo_get_type (void);
-
-void gst_slvideo_init_class (void);
-
-G_END_DECLS
-
-#endif // LL_GSTREAMER010_ENABLED
-
-#endif /* __GST_SLVIDEO_H__ */
diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
deleted file mode 100644
index 352b63583e..0000000000
--- a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ /dev/null
@@ -1,1266 +0,0 @@
-/** 
- * @file media_plugin_gstreamer010.cpp
- * @brief GStreamer-0.10 plugin for LLMedia API plugin system
- *
- * @cond
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-#include "linden_common.h"
-
-#include "llgl.h"
-
-#include "llplugininstance.h"
-#include "llpluginmessage.h"
-#include "llpluginmessageclasses.h"
-#include "media_plugin_base.h"
-
-#if LL_GSTREAMER010_ENABLED
-
-extern "C" {
-#include <gst/gst.h>
-}
-
-#include "llmediaimplgstreamer.h"
-#include "llmediaimplgstreamertriviallogging.h"
-
-#include "llmediaimplgstreamervidplug.h"
-
-#include "llmediaimplgstreamer_syms.h"
-
-//////////////////////////////////////////////////////////////////////////////
-//
-class MediaPluginGStreamer010 : public MediaPluginBase
-{
-public:
-	MediaPluginGStreamer010(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data);
-	~MediaPluginGStreamer010();
-
-	/* virtual */ void receiveMessage(const char *message_string);
-
-	static bool startup();
-	static bool closedown();
-
-	gboolean processGSTEvents(GstBus     *bus,
-				  GstMessage *message);
-
-private:
-	std::string getVersion();
-	bool navigateTo( const std::string urlIn );
-	bool seek( double time_sec );
-	bool setVolume( float volume );
-	
-	// misc
-	bool pause();
-	bool stop();
-	bool play(double rate);
-	bool getTimePos(double &sec_out);
-
-	static const double MIN_LOOP_SEC = 1.0F;
-
-	bool mIsLooping;
-
-	enum ECommand {
-		COMMAND_NONE,
-		COMMAND_STOP,
-		COMMAND_PLAY,
-		COMMAND_FAST_FORWARD,
-		COMMAND_FAST_REWIND,
-		COMMAND_PAUSE,
-		COMMAND_SEEK,
-	};
-	ECommand mCommand;
-
-private:
-	bool unload();
-	bool load();
-
-	bool update(int milliseconds);
-        void mouseDown( int x, int y );
-        void mouseUp( int x, int y );
-        void mouseMove( int x, int y );
-
-        void sizeChanged();
-	
-	static bool mDoneInit;
-	
-	guint mBusWatchID;
-	
-	float mVolume;
-
-	int mDepth;
-
-	// media NATURAL size
-	int mNaturalWidth;
-	int mNaturalHeight;
-	// media current size
-	int mCurrentWidth;
-	int mCurrentHeight;
-	int mCurrentRowbytes;
-	  // previous media size so we can detect changes
-	  int mPreviousWidth;
-	  int mPreviousHeight;
-	// desired render size from host
-	int mWidth;
-	int mHeight;
-	// padded texture size we need to write into
-	int mTextureWidth;
-	int mTextureHeight;
-	
-	int mTextureFormatPrimary;
-	int mTextureFormatType;
-
-	bool mSeekWanted;
-	double mSeekDestination;
-	
-	// Very GStreamer-specific
-	GMainLoop *mPump; // event pump for this media
-	GstElement *mPlaybin;
-	GstElement *mVisualizer;
-	GstSLVideo *mVideoSink;
-};
-
-//static
-bool MediaPluginGStreamer010::mDoneInit = false;
-
-MediaPluginGStreamer010::MediaPluginGStreamer010(
-	LLPluginInstance::sendMessageFunction host_send_func,
-	void *host_user_data ) :
-	MediaPluginBase(host_send_func, host_user_data),
-	mBusWatchID ( 0 ),
-	mCurrentRowbytes ( 4 ),
-	mTextureFormatPrimary ( GL_RGBA ),
-	mTextureFormatType ( GL_UNSIGNED_INT_8_8_8_8_REV ),
-	mSeekWanted(false),
-	mSeekDestination(0.0),
-	mPump ( NULL ),
-	mPlaybin ( NULL ),
-	mVisualizer ( NULL ),
-	mVideoSink ( NULL ),
-	mCommand ( COMMAND_NONE )
-{
-	std::ostringstream str;
-	INFOMSG("MediaPluginGStreamer010 constructor - my PID=%u", U32(getpid()));
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//#define LL_GST_REPORT_STATE_CHANGES
-#ifdef LL_GST_REPORT_STATE_CHANGES
-static char* get_gst_state_name(GstState state)
-{
-	switch (state) {
-	case GST_STATE_VOID_PENDING: return "VOID_PENDING";
-	case GST_STATE_NULL: return "NULL";
-	case GST_STATE_READY: return "READY";
-	case GST_STATE_PAUSED: return "PAUSED";
-	case GST_STATE_PLAYING: return "PLAYING";
-	}
-	return "(unknown)";
-}
-#endif // LL_GST_REPORT_STATE_CHANGES
-
-gboolean
-MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
-					  GstMessage *message)
-{
-	if (!message) 
-		return TRUE; // shield against GStreamer bug
-
-	if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_STATE_CHANGED &&
-	    GST_MESSAGE_TYPE(message) != GST_MESSAGE_BUFFERING)
-	{
-		DEBUGMSG("Got GST message type: %s",
-			LLGST_MESSAGE_TYPE_NAME (message));
-	}
-	else
-	{
-		// TODO: grok 'duration' message type
-		DEBUGMSG("Got GST message type: %s",
-			 LLGST_MESSAGE_TYPE_NAME (message));
-	}
-
-	switch (GST_MESSAGE_TYPE (message)) {
-	case GST_MESSAGE_BUFFERING: {
-		// NEEDS GST 0.10.11+
-		if (llgst_message_parse_buffering)
-		{
-			gint percent = 0;
-			llgst_message_parse_buffering(message, &percent);
-			DEBUGMSG("GST buffering: %d%%", percent);
-		}
-		break;
-	}
-	case GST_MESSAGE_STATE_CHANGED: {
-		GstState old_state;
-		GstState new_state;
-		GstState pending_state;
-		llgst_message_parse_state_changed(message,
-						&old_state,
-						&new_state,
-						&pending_state);
-#ifdef LL_GST_REPORT_STATE_CHANGES
-		// not generally very useful, and rather spammy.
-		DEBUGMSG("state change (old,<new>,pending): %s,<%s>,%s",
-			 get_gst_state_name(old_state),
-			 get_gst_state_name(new_state),
-			 get_gst_state_name(pending_state));
-#endif // LL_GST_REPORT_STATE_CHANGES
-
-		switch (new_state) {
-		case GST_STATE_VOID_PENDING:
-			break;
-		case GST_STATE_NULL:
-			break;
-		case GST_STATE_READY:
-			setStatus(STATUS_LOADED);
-			break;
-		case GST_STATE_PAUSED:
-			setStatus(STATUS_PAUSED);
-			break;
-		case GST_STATE_PLAYING:
-			setStatus(STATUS_PLAYING);
-			break;
-		}
-		break;
-	}
-	case GST_MESSAGE_ERROR: {
-		GError *err = NULL;
-		gchar *debug = NULL;
-
-		llgst_message_parse_error (message, &err, &debug);
-		WARNMSG("GST error: %s", err?err->message:"(unknown)");
-		if (err)
-			g_error_free (err);
-		g_free (debug);
-
-		mCommand = COMMAND_STOP;
-
-		setStatus(STATUS_ERROR);
-
-		break;
-	}
-	case GST_MESSAGE_INFO: {
-		if (llgst_message_parse_info)
-		{
-			GError *err = NULL;
-			gchar *debug = NULL;
-			
-			llgst_message_parse_info (message, &err, &debug);
-			INFOMSG("GST info: %s", err?err->message:"(unknown)");
-			if (err)
-				g_error_free (err);
-			g_free (debug);
-		}
-		break;
-	}
-	case GST_MESSAGE_WARNING: {
-		GError *err = NULL;
-		gchar *debug = NULL;
-
-		llgst_message_parse_warning (message, &err, &debug);
-		WARNMSG("GST warning: %s", err?err->message:"(unknown)");
-		if (err)
-			g_error_free (err);
-		g_free (debug);
-
-		break;
-	}
-	case GST_MESSAGE_EOS:
-		/* end-of-stream */
-		DEBUGMSG("GST end-of-stream.");
-		if (mIsLooping)
-		{
-			DEBUGMSG("looping media...");
-			double eos_pos_sec = 0.0F;
-			bool got_eos_position = getTimePos(eos_pos_sec);
-
-			if (got_eos_position && eos_pos_sec < MIN_LOOP_SEC)
-			{
-				// if we know that the movie is really short, don't
-				// loop it else it can easily become a time-hog
-				// because of GStreamer spin-up overhead
-				DEBUGMSG("really short movie (%0.3fsec) - not gonna loop this, pausing instead.", eos_pos_sec);
-				// inject a COMMAND_PAUSE
-				mCommand = COMMAND_PAUSE;
-			}
-			else
-			{
-#undef LLGST_LOOP_BY_SEEKING
-// loop with a stop-start instead of a seek, because it actually seems rather
-// faster than seeking on remote streams.
-#ifdef LLGST_LOOP_BY_SEEKING
-				// first, try looping by an explicit rewind
-				bool seeksuccess = seek(0.0);
-				if (seeksuccess)
-				{
-					play(1.0);
-				}
-				else
-#endif // LLGST_LOOP_BY_SEEKING
-				{  // use clumsy stop-start to loop
-					DEBUGMSG("didn't loop by rewinding - stopping and starting instead...");
-					stop();
-					play(1.0);
-				}
-			}
-		}
-		else // not a looping media
-		{
-			// inject a COMMAND_STOP
-			mCommand = COMMAND_STOP;
-		}
-		break;
-	default:
-		/* unhandled message */
-		break;
-	}
-
-	/* we want to be notified again the next time there is a message
-	 * on the bus, so return true (false means we want to stop watching
-	 * for messages on the bus and our callback should not be called again)
-	 */
-	return TRUE;
-}
-
-extern "C" {
-gboolean
-llmediaimplgstreamer_bus_callback (GstBus     *bus,
-				   GstMessage *message,
-				   gpointer    data)
-{
-	MediaPluginGStreamer010 *impl = (MediaPluginGStreamer010*)data;
-	return impl->processGSTEvents(bus, message);
-}
-} // extern "C"
-
-
-
-bool
-MediaPluginGStreamer010::navigateTo ( const std::string urlIn )
-{
-	if (!mDoneInit)
-		return false; // error
-
-	setStatus(STATUS_LOADING);
-
-	DEBUGMSG("Setting media URI: %s", urlIn.c_str());
-
-	mSeekWanted = false;
-
-	if (NULL == mPump ||
-	    NULL == mPlaybin)
-	{
-		setStatus(STATUS_ERROR);
-		return false; // error
-	}
-
-	// set URI
-	g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), NULL);
-	//g_object_set (G_OBJECT (mPlaybin), "uri", "file:///tmp/movie", NULL);
-
-	// navigateTo implicitly plays, too.
-	play(1.0);
-
-	return true;
-}
-
-
-bool
-MediaPluginGStreamer010::update(int milliseconds)
-{
-	if (!mDoneInit)
-		return false; // error
-
-	DEBUGMSG("updating media...");
-	
-	// sanity check
-	if (NULL == mPump ||
-	    NULL == mPlaybin)
-	{
-		DEBUGMSG("dead media...");
-		return false;
-	}
-
-	// see if there's an outstanding seek wanted
-	if (mSeekWanted &&
-	    // bleh, GST has to be happy that the movie is really truly playing
-	    // or it may quietly ignore the seek (with rtsp:// at least).
-	    (GST_STATE(mPlaybin) == GST_STATE_PLAYING))
-	{
-		seek(mSeekDestination);
-		mSeekWanted = false;
-	}
-
-	// *TODO: time-limit - but there isn't a lot we can do here, most
-	// time is spent in gstreamer's own opaque worker-threads.  maybe
-	// we can do something sneaky like only unlock the video object
-	// for 'milliseconds' and otherwise hold the lock.
-	while (g_main_context_pending(g_main_loop_get_context(mPump)))
-	{
-	       g_main_context_iteration(g_main_loop_get_context(mPump), FALSE);
-	}
-
-	// check for availability of a new frame
-	
-	if (mVideoSink)
-	{
-	        GST_OBJECT_LOCK(mVideoSink);
-		if (mVideoSink->retained_frame_ready)
-		{
-			DEBUGMSG("NEW FRAME READY");
-
-			if (mVideoSink->retained_frame_width != mCurrentWidth ||
-			    mVideoSink->retained_frame_height != mCurrentHeight)
-				// *TODO: also check for change in format
-			{
-				// just resize container, don't consume frame
-				int neww = mVideoSink->retained_frame_width;
-				int newh = mVideoSink->retained_frame_height;
-
-				int newd = 4;
-				mTextureFormatPrimary = GL_RGBA;
-				mTextureFormatType = GL_UNSIGNED_INT_8_8_8_8_REV;
-
-				/*
-				int newd = SLVPixelFormatBytes[mVideoSink->retained_frame_format];
-				if (SLV_PF_BGRX == mVideoSink->retained_frame_format)
-				{
-					mTextureFormatPrimary = GL_BGRA;
-					mTextureFormatType = GL_UNSIGNED_INT_8_8_8_8_REV;
-				}
-				else
-				{
-					mTextureFormatPrimary = GL_RGBA;
-					mTextureFormatType = GL_UNSIGNED_INT_8_8_8_8_REV;
-				}
-				*/
-
-				GST_OBJECT_UNLOCK(mVideoSink);
-
-				mCurrentRowbytes = neww * newd;
-				DEBUGMSG("video container resized to %dx%d",
-					 neww, newh);
-
-				mDepth = newd;
-				mCurrentWidth = neww;
-				mCurrentHeight = newh;
-				sizeChanged();
-				return true;
-			}
-
-			if (mPixels &&
-			    mCurrentHeight <= mHeight &&
-			    mCurrentWidth <= mWidth &&
-			    !mTextureSegmentName.empty())
-			{
-				// we're gonna totally consume this frame - reset 'ready' flag
-				mVideoSink->retained_frame_ready = FALSE;
-				int destination_rowbytes = mWidth * mDepth;
-				for (int row=0; row<mCurrentHeight; ++row)
-				{
-					memcpy(&mPixels
-					        [destination_rowbytes * row],
-					       &mVideoSink->retained_frame_data
-					        [mCurrentRowbytes * row],
-					       mCurrentRowbytes);
-				}
-
-				GST_OBJECT_UNLOCK(mVideoSink);
-				DEBUGMSG("NEW FRAME REALLY TRULY CONSUMED, TELLING HOST");
-
-				setDirty(0,0,mCurrentWidth,mCurrentHeight);
-			}
-			else
-			{
-				// new frame ready, but we're not ready to
-				// consume it.
-
-				GST_OBJECT_UNLOCK(mVideoSink);
-
-				DEBUGMSG("NEW FRAME not consumed, still waiting for a shm segment and/or shm resize");
-			}
-
-			return true;
-		}
-		else
-		{
-			// nothing to do yet.
-			GST_OBJECT_UNLOCK(mVideoSink);
-			return true;
-		}
-	}
-
-	return true;
-}
-
-
-void
-MediaPluginGStreamer010::mouseDown( int x, int y )
-{
-  // do nothing
-}
-
-void
-MediaPluginGStreamer010::mouseUp( int x, int y )
-{
-  // do nothing
-}
-
-void
-MediaPluginGStreamer010::mouseMove( int x, int y )
-{
-  // do nothing
-}
-
-
-bool
-MediaPluginGStreamer010::pause()
-{
-	DEBUGMSG("pausing media...");
-	// todo: error-check this?
-	if (mDoneInit && mPlaybin)
-	{
-		llgst_element_set_state(mPlaybin, GST_STATE_PAUSED);
-		return true;
-	}
-	return false;
-}
-
-bool
-MediaPluginGStreamer010::stop()
-{
-	DEBUGMSG("stopping media...");
-	// todo: error-check this?
-	if (mDoneInit && mPlaybin)
-	{
-		llgst_element_set_state(mPlaybin, GST_STATE_READY);
-		return true;
-	}
-	return false;
-}
-
-bool
-MediaPluginGStreamer010::play(double rate)
-{
-	// NOTE: we don't actually support non-natural rate.
-
-        DEBUGMSG("playing media... rate=%f", rate);
-	// todo: error-check this?
-	if (mDoneInit && mPlaybin)
-	{
-		llgst_element_set_state(mPlaybin, GST_STATE_PLAYING);
-		return true;
-	}
-	return false;
-}
-
-bool
-MediaPluginGStreamer010::setVolume( float volume )
-{
-	// we try to only update volume as conservatively as
-	// possible, as many gst-plugins-base versions up to at least
-	// November 2008 have critical race-conditions in setting volume - sigh
-	if (mVolume == volume)
-		return true; // nothing to do, everything's fine
-
-	mVolume = volume;
-	if (mDoneInit && mPlaybin)
-	{
-		g_object_set(mPlaybin, "volume", mVolume, NULL);
-		return true;
-	}
-
-	return false;
-}
-
-bool
-MediaPluginGStreamer010::seek(double time_sec)
-{
-	bool success = false;
-	if (mDoneInit && mPlaybin)
-	{
-		success = llgst_element_seek(mPlaybin, 1.0F, GST_FORMAT_TIME,
-				GstSeekFlags(GST_SEEK_FLAG_FLUSH |
-					     GST_SEEK_FLAG_KEY_UNIT),
-				GST_SEEK_TYPE_SET, gint64(time_sec*GST_SECOND),
-				GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
-	}
-	DEBUGMSG("MEDIA SEEK REQUEST to %fsec result was %d",
-		 float(time_sec), int(success));
-	return success;
-}
-
-bool
-MediaPluginGStreamer010::getTimePos(double &sec_out)
-{
-	bool got_position = false;
-	if (mDoneInit && mPlaybin)
-	{
-		gint64 pos;
-		GstFormat timefmt = GST_FORMAT_TIME;
-		got_position =
-			llgst_element_query_position &&
-			llgst_element_query_position(mPlaybin,
-						     &timefmt,
-						     &pos);
-		got_position = got_position
-			&& (timefmt == GST_FORMAT_TIME);
-		// GStreamer may have other ideas, but we consider the current position
-		// undefined if not PLAYING or PAUSED
-		got_position = got_position &&
-			(GST_STATE(mPlaybin) == GST_STATE_PLAYING ||
-			 GST_STATE(mPlaybin) == GST_STATE_PAUSED);
-		if (got_position && !GST_CLOCK_TIME_IS_VALID(pos))
-		{
-			if (GST_STATE(mPlaybin) == GST_STATE_PLAYING)
-			{
-				// if we're playing then we treat an invalid clock time
-				// as 0, for complicated reasons (insert reason here)
-				pos = 0;
-			}
-			else
-			{
-				got_position = false;
-			}
-			
-		}
-		// If all the preconditions succeeded... we can trust the result.
-		if (got_position)
-		{
-			sec_out = double(pos) / double(GST_SECOND); // gst to sec
-		}
-	}
-	return got_position;
-}
-
-bool
-MediaPluginGStreamer010::load()
-{
-	if (!mDoneInit)
-		return false; // error
-
-	setStatus(STATUS_LOADING);
-
-	DEBUGMSG("setting up media...");
-
-	mIsLooping = false;
-	mVolume = 0.1234567; // minor hack to force an initial volume update
-
-	// Create a pumpable main-loop for this media
-	mPump = g_main_loop_new (NULL, FALSE);
-	if (!mPump)
-	{
-		setStatus(STATUS_ERROR);
-		return false; // error
-	}
-
-	// instantiate a playbin element to do the hard work
-	mPlaybin = llgst_element_factory_make ("playbin", "play");
-	if (!mPlaybin)
-	{
-		setStatus(STATUS_ERROR);
-		return false; // error
-	}
-
-	// get playbin's bus
-	GstBus *bus = llgst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
-	if (!bus)
-	{
-		setStatus(STATUS_ERROR);
-		return false; // error
-	}
-	mBusWatchID = llgst_bus_add_watch (bus,
-					   llmediaimplgstreamer_bus_callback,
-					   this);
-	llgst_object_unref (bus);
-
-#if 0 // not quite stable/correct yet
-	// get a visualizer element (bonus feature!)
-	char* vis_name = getenv("LL_GST_VIS_NAME");
-	if (!vis_name ||
-	    (vis_name && std::string(vis_name)!="none"))
-	{
-		if (vis_name)
-		{
-			mVisualizer = llgst_element_factory_make (vis_name, "vis");
-		}
-		if (!mVisualizer)
-		{
-			mVisualizer = llgst_element_factory_make ("libvisual_jess", "vis");
-			if (!mVisualizer)
-			{
-				mVisualizer = llgst_element_factory_make ("goom", "vis");
-				if (!mVisualizer)
-				{
-					mVisualizer = llgst_element_factory_make ("libvisual_lv_scope", "vis");
-					if (!mVisualizer)
-					{
-						// That's okay, we don't NEED this.
-					}
-				}
-			}
-		}
-	}
-#endif
-
-	if (NULL == getenv("LL_GSTREAMER_EXTERNAL")) {
-		// instantiate a custom video sink
-		mVideoSink =
-			GST_SLVIDEO(llgst_element_factory_make ("private-slvideo", "slvideo"));
-		if (!mVideoSink)
-		{
-			WARNMSG("Could not instantiate private-slvideo element.");
-			// todo: cleanup.
-			setStatus(STATUS_ERROR);
-			return false; // error
-		}
-
-		// connect the pieces
-		g_object_set(mPlaybin, "video-sink", mVideoSink, NULL);
-	}
-
-	if (mVisualizer)
-	{
-		g_object_set(mPlaybin, "vis-plugin", mVisualizer, NULL);
-	}
-
-	return true;
-}
-
-bool
-MediaPluginGStreamer010::unload ()
-{
-	if (!mDoneInit)
-		return false; // error
-
-	DEBUGMSG("unloading media...");
-	
-	// stop getting callbacks for this bus
-	g_source_remove(mBusWatchID);
-	mBusWatchID = 0;
-
-	if (mPlaybin)
-	{
-		llgst_element_set_state (mPlaybin, GST_STATE_NULL);
-		llgst_object_unref (GST_OBJECT (mPlaybin));
-		mPlaybin = NULL;
-	}
-
-	if (mVisualizer)
-	{
-		llgst_object_unref (GST_OBJECT (mVisualizer));
-		mVisualizer = NULL;
-	}
-
-	if (mPump)
-	{
-		g_main_loop_quit(mPump);
-		mPump = NULL;
-	}
-
-	mVideoSink = NULL;
-
-	setStatus(STATUS_NONE);
-
-	return true;
-}
-
-
-//static
-bool
-MediaPluginGStreamer010::startup()
-{
-	// first - check if GStreamer is explicitly disabled
-	if (NULL != getenv("LL_DISABLE_GSTREAMER"))
-		return false;
-
-	// only do global GStreamer initialization once.
-	if (!mDoneInit)
-	{
-		g_thread_init(NULL);
-
-		// Init the glib type system - we need it.
-		g_type_init();
-
-		// Get symbols!
-#if LL_DARWIN
-		if (! grab_gst_syms("libgstreamer-0.10.dylib",
-				    "libgstvideo-0.10.dylib") )
-#elseif LL_WINDOWS
-		if (! grab_gst_syms("libgstreamer-0.10.dll",
-				    "libgstvideo-0.10.dll") )
-#else // linux or other ELFy unixoid
-		if (! grab_gst_syms("libgstreamer-0.10.so.0",
-				    "libgstvideo-0.10.so.0") )
-#endif
-		{
-			WARNMSG("Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled.");
-			return false;
-		}
-
-		if (llgst_segtrap_set_enabled)
-		{
-			llgst_segtrap_set_enabled(FALSE);
-		}
-		else
-		{
-			WARNMSG("gst_segtrap_set_enabled() is not available; plugin crashes won't be caught.");
-		}
-
-#if LL_LINUX
-		// Gstreamer tries a fork during init, waitpid-ing on it,
-		// which conflicts with any installed SIGCHLD handler...
-		struct sigaction tmpact, oldact;
-		if (llgst_registry_fork_set_enabled) {
-			// if we can disable SIGCHLD-using forking behaviour,
-			// do it.
-			llgst_registry_fork_set_enabled(false);
-		}
-		else {
-			// else temporarily install default SIGCHLD handler
-			// while GStreamer initialises
-			tmpact.sa_handler = SIG_DFL;
-			sigemptyset( &tmpact.sa_mask );
-			tmpact.sa_flags = SA_SIGINFO;
-			sigaction(SIGCHLD, &tmpact, &oldact);
-		}
-#endif // LL_LINUX
-
-		// Protect against GStreamer resetting the locale, yuck.
-		static std::string saved_locale;
-		saved_locale = setlocale(LC_ALL, NULL);
-
-		// finally, try to initialize GStreamer!
-		GError *err = NULL;
-		gboolean init_gst_success = llgst_init_check(NULL, NULL, &err);
-
-		// restore old locale
-		setlocale(LC_ALL, saved_locale.c_str() );
-
-#if LL_LINUX
-		// restore old SIGCHLD handler
-		if (!llgst_registry_fork_set_enabled)
-			sigaction(SIGCHLD, &oldact, NULL);
-#endif // LL_LINUX
-
-		if (!init_gst_success) // fail
-		{
-			if (err)
-			{
-				WARNMSG("GST init failed: %s", err->message);
-				g_error_free(err);
-			}
-			else
-			{
-				WARNMSG("GST init failed for unspecified reason.");
-			}
-			return false;
-		}
-		
-		// Init our custom plugins - only really need do this once.
-		gst_slvideo_init_class();
-
-		mDoneInit = true;
-	}
-
-	return true;
-}
-
-
-void
-MediaPluginGStreamer010::sizeChanged()
-{
-	// the shared writing space has possibly changed size/location/whatever
-
-	// Check to see whether the movie's NATURAL size has been set yet
-	if (1 == mNaturalWidth &&
-	    1 == mNaturalHeight)
-	{
-		mNaturalWidth = mCurrentWidth;
-		mNaturalHeight = mCurrentHeight;
-		DEBUGMSG("Media NATURAL size better detected as %dx%d",
-			 mNaturalWidth, mNaturalHeight);
-	}
-
-	// if the size has changed then the shm has changed and the app needs telling
-	if (mCurrentWidth != mPreviousWidth ||
-	    mCurrentHeight != mPreviousHeight)
-	{
-		mPreviousWidth = mCurrentWidth;
-		mPreviousHeight = mCurrentHeight;
-
-		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_request");
-		message.setValue("name", mTextureSegmentName);
-		message.setValueS32("width", mNaturalWidth);
-		message.setValueS32("height", mNaturalHeight);
-		DEBUGMSG("<--- Sending size change request to application with name: '%s' - natural size is %d x %d", mTextureSegmentName.c_str(), mNaturalWidth, mNaturalHeight);
-		sendMessage(message);
-	}
-}
-
-
-
-//static
-bool
-MediaPluginGStreamer010::closedown()
-{
-	if (!mDoneInit)
-		return false; // error
-
-	ungrab_gst_syms();
-
-	mDoneInit = false;
-
-	return true;
-}
-
-MediaPluginGStreamer010::~MediaPluginGStreamer010()
-{
-	DEBUGMSG("MediaPluginGStreamer010 destructor");
-
-	closedown();
-
-	DEBUGMSG("GStreamer010 closing down");
-}
-
-
-std::string
-MediaPluginGStreamer010::getVersion()
-{
-	std::string plugin_version = "GStreamer010 media plugin, GStreamer version ";
-	if (mDoneInit &&
-	    llgst_version)
-	{
-		guint major, minor, micro, nano;
-		llgst_version(&major, &minor, &micro, &nano);
-		plugin_version += llformat("%u.%u.%u.%u (runtime), %u.%u.%u.%u (headers)", (unsigned int)major, (unsigned int)minor, (unsigned int)micro, (unsigned int)nano, (unsigned int)GST_VERSION_MAJOR, (unsigned int)GST_VERSION_MINOR, (unsigned int)GST_VERSION_MICRO, (unsigned int)GST_VERSION_NANO);
-	}
-	else
-	{
-		plugin_version += "(unknown)";
-	}
-	return plugin_version;
-}
-
-void MediaPluginGStreamer010::receiveMessage(const char *message_string)
-{
-	//std::cerr << "MediaPluginGStreamer010::receiveMessage: received message: \"" << message_string << "\"" << std::endl;
-
-	LLPluginMessage message_in;
-
-	if(message_in.parse(message_string) >= 0)
-	{
-		std::string message_class = message_in.getClass();
-		std::string message_name = message_in.getName();
-		if(message_class == LLPLUGIN_MESSAGE_CLASS_BASE)
-		{
-			if(message_name == "init")
-			{
-				LLPluginMessage message("base", "init_response");
-				LLSD versions = LLSD::emptyMap();
-				versions[LLPLUGIN_MESSAGE_CLASS_BASE] = LLPLUGIN_MESSAGE_CLASS_BASE_VERSION;
-				versions[LLPLUGIN_MESSAGE_CLASS_MEDIA] = LLPLUGIN_MESSAGE_CLASS_MEDIA_VERSION;
-				versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME] = LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME_VERSION;
-				message.setValueLLSD("versions", versions);
-
-				if ( load() )
-				{
-					DEBUGMSG("GStreamer010 media instance set up");
-				}
-				else
-				{
-					WARNMSG("GStreamer010 media instance failed to set up");
-				}
-
-				message.setValue("plugin_version", getVersion());
-				sendMessage(message);
-			}
-			else if(message_name == "idle")
-			{
-				// no response is necessary here.
-				double time = message_in.getValueReal("time");
-				
-				// Convert time to milliseconds for update()
-				update((int)(time * 1000.0f));
-			}
-			else if(message_name == "cleanup")
-			{
-				unload();
-				closedown();
-			}
-			else if(message_name == "shm_added")
-			{
-				SharedSegmentInfo info;
-				info.mAddress = message_in.getValuePointer("address");
-				info.mSize = (size_t)message_in.getValueS32("size");
-				std::string name = message_in.getValue("name");
-
-				std::ostringstream str;
-				INFOMSG("MediaPluginGStreamer010::receiveMessage: shared memory added, name: %s, size: %d, address: %p", name.c_str(), int(info.mSize), info.mAddress);
-
-				mSharedSegments.insert(SharedSegmentMap::value_type(name, info));
-			}
-			else if(message_name == "shm_remove")
-			{
-				std::string name = message_in.getValue("name");
-
-				DEBUGMSG("MediaPluginGStreamer010::receiveMessage: shared memory remove, name = %s", name.c_str());
-				
-				SharedSegmentMap::iterator iter = mSharedSegments.find(name);
-				if(iter != mSharedSegments.end())
-				{
-					if(mPixels == iter->second.mAddress)
-					{
-						// This is the currently active pixel buffer.  Make sure we stop drawing to it.
-						mPixels = NULL;
-						mTextureSegmentName.clear();
-						
-						// Make sure the movie decoder is no longer pointed at the shared segment.
-						sizeChanged();						
-					}
-					mSharedSegments.erase(iter);
-				}
-				else
-				{
-					WARNMSG("MediaPluginGStreamer010::receiveMessage: unknown shared memory region!");
-				}
-
-				// Send the response so it can be cleaned up.
-				LLPluginMessage message("base", "shm_remove_response");
-				message.setValue("name", name);
-				sendMessage(message);
-			}
-			else
-			{
-				std::ostringstream str;
-				INFOMSG("MediaPluginGStreamer010::receiveMessage: unknown base message: %s", message_name.c_str());
-			}
-		}
-		else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA)
-		{
-			if(message_name == "init")
-			{
-				// Plugin gets to decide the texture parameters to use.
-				LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params");
-				// lame to have to decide this now, it depends on the movie.  Oh well.
-				mDepth = 4;
-
-				mCurrentWidth = 1;
-				mCurrentHeight = 1;
-				mPreviousWidth = 1;
-				mPreviousHeight = 1;
-				mNaturalWidth = 1;
-				mNaturalHeight = 1;
-				mWidth = 1;
-				mHeight = 1;
-				mTextureWidth = 1;
-				mTextureHeight = 1;
-
-				message.setValueU32("format", GL_RGBA);
-				message.setValueU32("type", GL_UNSIGNED_INT_8_8_8_8_REV);
-
-				message.setValueS32("depth", mDepth);
-				message.setValueS32("default_width", mWidth);
-				message.setValueS32("default_height", mHeight);
-				message.setValueU32("internalformat", GL_RGBA8);
-				message.setValueBoolean("coords_opengl", true);	// true == use OpenGL-style coordinates, false == (0,0) is upper left.
-				message.setValueBoolean("allow_downsample", true); // we respond with grace and performance if asked to downscale
-				sendMessage(message);
-			}
-			else if(message_name == "size_change")
-			{
-				std::string name = message_in.getValue("name");
-				S32 width = message_in.getValueS32("width");
-				S32 height = message_in.getValueS32("height");
-				S32 texture_width = message_in.getValueS32("texture_width");
-				S32 texture_height = message_in.getValueS32("texture_height");
-
-				std::ostringstream str;
-				INFOMSG("---->Got size change instruction from application with shm name: %s - size is %d x %d", name.c_str(), width, height);
-
-				LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_response");
-				message.setValue("name", name);
-				message.setValueS32("width", width);
-				message.setValueS32("height", height);
-				message.setValueS32("texture_width", texture_width);
-				message.setValueS32("texture_height", texture_height);
-				sendMessage(message);
-
-				if(!name.empty())
-				{
-					// Find the shared memory region with this name
-					SharedSegmentMap::iterator iter = mSharedSegments.find(name);
-					if(iter != mSharedSegments.end())
-					{
-						INFOMSG("*** Got size change with matching shm, new size is %d x %d", width, height);
-						INFOMSG("*** Got size change with matching shm, texture size size is %d x %d", texture_width, texture_height);
-
-						mPixels = (unsigned char*)iter->second.mAddress;
-						mTextureSegmentName = name;
-						mWidth = width;
-						mHeight = height;
-
-						if (texture_width > 1 ||
-						    texture_height > 1) // not a dummy size from the app, a real explicit forced size
-						{
-							INFOMSG("**** = REAL RESIZE REQUEST FROM APP");
-							
-							GST_OBJECT_LOCK(mVideoSink);
-							mVideoSink->resize_forced_always = true;
-							mVideoSink->resize_try_width = texture_width;
-							mVideoSink->resize_try_height = texture_height;
-							GST_OBJECT_UNLOCK(mVideoSink);
- 						}
-
-						mTextureWidth = texture_width;
-						mTextureHeight = texture_height;
-					}
-				}
-			}
-			else if(message_name == "load_uri")
-			{
-				std::string uri = message_in.getValue("uri");
-				navigateTo( uri );
-				sendStatus();		
-			}
-			else if(message_name == "mouse_event")
-			{
-				std::string event = message_in.getValue("event");
-				S32 x = message_in.getValueS32("x");
-				S32 y = message_in.getValueS32("y");
-				
-				if(event == "down")
-				{
-					mouseDown(x, y);
-				}
-				else if(event == "up")
-				{
-					mouseUp(x, y);
-				}
-				else if(event == "move")
-				{
-					mouseMove(x, y);
-				};
-			};
-		}
-		else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME)
-		{
-			if(message_name == "stop")
-			{
-				stop();
-			}
-			else if(message_name == "start")
-			{
-				double rate = 0.0;
-				if(message_in.hasValue("rate"))
-				{
-					rate = message_in.getValueReal("rate");
-				}
-				// NOTE: we don't actually support rate.
-				play(rate);
-			}
-			else if(message_name == "pause")
-			{
-				pause();
-			}
-			else if(message_name == "seek")
-			{
-				double time = message_in.getValueReal("time");
-				// defer the actual seek in case we haven't
-				// really truly started yet in which case there
-				// is nothing to seek upon
-				mSeekWanted = true;
-				mSeekDestination = time;
-			}
-			else if(message_name == "set_loop")
-			{
-				bool loop = message_in.getValueBoolean("loop");
-				mIsLooping = loop;
-			}
-			else if(message_name == "set_volume")
-			{
-				double volume = message_in.getValueReal("volume");
-				setVolume(volume);
-			}
-		}
-		else
-		{
-			INFOMSG("MediaPluginGStreamer010::receiveMessage: unknown message class: %s", message_class.c_str());
-		}
-	}
-}
-
-int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data)
-{
-	if (MediaPluginGStreamer010::startup())
-	{
-		MediaPluginGStreamer010 *self = new MediaPluginGStreamer010(host_send_func, host_user_data);
-		*plugin_send_func = MediaPluginGStreamer010::staticReceiveMessage;
-		*plugin_user_data = (void*)self;
-		
-		return 0; // okay
-	}
-	else 
-	{
-		return -1; // failed to init
-	}
-}
-
-#else // LL_GSTREAMER010_ENABLED
-
-// Stubbed-out class with constructor/destructor (necessary or windows linker
-// will just think its dead code and optimize it all out)
-class MediaPluginGStreamer010 : public MediaPluginBase
-{
-public:
-	MediaPluginGStreamer010(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data);
-	~MediaPluginGStreamer010();
-	/* virtual */ void receiveMessage(const char *message_string);
-};
-
-MediaPluginGStreamer010::MediaPluginGStreamer010(
-	LLPluginInstance::sendMessageFunction host_send_func,
-	void *host_user_data ) :
-	MediaPluginBase(host_send_func, host_user_data)
-{
-    // no-op
-}
-
-MediaPluginGStreamer010::~MediaPluginGStreamer010()
-{
-    // no-op
-}
-
-void MediaPluginGStreamer010::receiveMessage(const char *message_string)
-{
-    // no-op 
-}
-
-// We're building without GStreamer enabled.  Just refuse to initialize.
-int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data, LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data)
-{
-    return -1;
-}
-
-#endif // LL_GSTREAMER010_ENABLED
diff --git a/indra/media_plugins/gstreamer10/CMakeLists.txt b/indra/media_plugins/gstreamer10/CMakeLists.txt
index ffa3c30519..14ce5bfaa1 100644
--- a/indra/media_plugins/gstreamer10/CMakeLists.txt
+++ b/indra/media_plugins/gstreamer10/CMakeLists.txt
@@ -16,13 +16,8 @@ include(GStreamer10Plugin)
 
 ### media_plugin_gstreamer10
 
-if(NOT WINDOWS) # not windows therefore gcc LINUX and DARWIN
-add_definitions(-fPIC)
-endif()
-
 set(media_plugin_gstreamer10_SOURCE_FILES
     media_plugin_gstreamer10.cpp
-    llmediaimplgstreamer_syms.cpp
     )
 
 set(media_plugin_gstreamer10_HEADER_FILES
diff --git a/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms.cpp b/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms.cpp
deleted file mode 100644
index e5e5c1c9a3..0000000000
--- a/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/** 
- * @file llmediaimplgstreamer_syms.cpp
- * @brief dynamic GStreamer symbol-grabbing code
- *
- * @cond
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-#include <string>
-#include <iostream>
-#include <vector>
-
-#ifdef LL_WINDOWS
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#include <Windows.h>
-#endif
-
-#include "linden_common.h"
-
-extern "C" {
-#include <gst/gst.h>
-#include <gst/app/gstappsink.h>
-}
-
-#include "apr_pools.h"
-#include "apr_dso.h"
-
-#ifdef LL_WINDOWS
-
-#ifndef _M_AMD64
-#define GSTREAMER_REG_KEY "Software\\GStreamer1.0\\x86"
-#define GSTREAMER_DIR_SUFFIX "1.0\\x86\\bin\\"
-#else
-#define GSTREAMER_REG_KEY "Software\\GStreamer1.0\\x86_64"
-#define GSTREAMER_DIR_SUFFIX "1.0\\x86_64\\bin\\"
-#endif
-
-bool openRegKey( HKEY &aKey )
-{
-	// Try native (32 bit view/64 bit view) of registry first.
-	if( ERROR_SUCCESS == ::RegOpenKeyExA( HKEY_LOCAL_MACHINE, GSTREAMER_REG_KEY, 0, KEY_QUERY_VALUE, &aKey ) )
-		return true;
-
-	// If native view fails, use 32 bit view or registry.
-	if( ERROR_SUCCESS == ::RegOpenKeyExA( HKEY_LOCAL_MACHINE, GSTREAMER_REG_KEY, 0, KEY_QUERY_VALUE | KEY_WOW64_32KEY, &aKey ) )
-		return true;
-
-	return false;
-}
-
-std::string getGStreamerDir()
-{
-	std::string ret;
-	HKEY hKey;
-
-	if( openRegKey( hKey ) )
-	{
-		DWORD dwLen(0);
-		::RegQueryValueExA( hKey, "InstallDir", nullptr, nullptr, nullptr, &dwLen );
-
-		if( dwLen > 0 )
-		{
-			std::vector< char > vctBuffer;
-			vctBuffer.resize( dwLen );
-			::RegQueryValueExA( hKey, "InstallDir", nullptr, nullptr, reinterpret_cast< LPBYTE>(&vctBuffer[ 0 ]), &dwLen );
-			ret = &vctBuffer[0];
-
-			if( ret[ dwLen-1 ] != '\\' )
-				ret += "\\";
-			ret += GSTREAMER_DIR_SUFFIX;
-
-			SetDllDirectoryA( ret.c_str() );
-		}
-		::RegCloseKey( hKey );
-	}
-	return ret;
-}
-#else
-std::string getGStreamerDir() { return ""; }
-#endif
-
-#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) RTN (*ll##GSTSYM)(__VA_ARGS__) = NULL;
-#include "llmediaimplgstreamer_syms_raw.inc"
-#undef LL_GST_SYM
-
-struct Symloader
-{
-	bool mRequired;
-	char const *mName;
-	apr_dso_handle_sym_t *mPPFunc;
-};
-
-#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) { REQ, #GSTSYM , (apr_dso_handle_sym_t*)&ll##GSTSYM}, 
-Symloader sSyms[] = {
-#include "llmediaimplgstreamer_syms_raw.inc"
-{ false, 0, 0 } };
-#undef LL_GST_SYM
-
-// a couple of stubs for disgusting reasons
-GstDebugCategory*
-ll_gst_debug_category_new(gchar *name, guint color, gchar *description)
-{
-	static GstDebugCategory dummy;
-	return &dummy;
-}
-void ll_gst_debug_register_funcptr(GstDebugFuncPtr func, gchar* ptrname)
-{
-}
-
-static bool sSymsGrabbed = false;
-static apr_pool_t *sSymGSTDSOMemoryPool = NULL;
-
-std::vector< apr_dso_handle_t* > sLoadedLibraries;
-
-bool grab_gst_syms( std::vector< std::string > const &aDSONames )
-{
-	if (sSymsGrabbed)
-		return true;
-
-	//attempt to load the shared libraries
-	apr_pool_create(&sSymGSTDSOMemoryPool, NULL);
-  
-	for( std::vector< std::string >::const_iterator itr = aDSONames.begin(); itr != aDSONames.end(); ++itr )
-	{
-		apr_dso_handle_t *pDSO(NULL);
-		std::string strDSO = getGStreamerDir() + *itr;
-		if( APR_SUCCESS == apr_dso_load( &pDSO, strDSO.c_str(), sSymGSTDSOMemoryPool ))
-			sLoadedLibraries.push_back( pDSO );
-		
-		for( int i = 0; sSyms[ i ].mName; ++i )
-		{
-			if( !*sSyms[ i ].mPPFunc )
-			{
-				apr_dso_sym( sSyms[ i ].mPPFunc, pDSO, sSyms[ i ].mName );
-			}
-		}
-	}
-
-	std::stringstream strm;
-	bool sym_error = false;
-	for( int i = 0; sSyms[ i ].mName; ++i )
-	{
-		if( sSyms[ i ].mRequired && ! *sSyms[ i ].mPPFunc )
-		{
-			sym_error = true;
-			strm << sSyms[ i ].mName << std::endl;
-		}
-	}
-
-	sSymsGrabbed = !sym_error;
-	return sSymsGrabbed;
-}
-
-
-void ungrab_gst_syms()
-{ 
-	// should be safe to call regardless of whether we've
-	// actually grabbed syms.
-
-	for( std::vector< apr_dso_handle_t* >::iterator itr = sLoadedLibraries.begin(); itr != sLoadedLibraries.end(); ++itr )
-		apr_dso_unload( *itr );
-
-	sLoadedLibraries.clear();
-
-	if ( sSymGSTDSOMemoryPool )
-	{
-		apr_pool_destroy(sSymGSTDSOMemoryPool);
-		sSymGSTDSOMemoryPool = NULL;
-	}
-
-	for( int i = 0; sSyms[ i ].mName; ++i )
-		*sSyms[ i ].mPPFunc = NULL;
-
-	sSymsGrabbed = false;
-}
-
diff --git a/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms.h b/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms.h
deleted file mode 100644
index 0874644ee6..0000000000
--- a/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/** 
- * @file llmediaimplgstreamer_syms.h
- * @brief dynamic GStreamer symbol-grabbing code
- *
- * @cond
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- * @endcond
- */
-
-#include "linden_common.h"
-#include <vector>
-extern "C" {
-#include <gst/gst.h>
-}
-
-bool grab_gst_syms( std::vector< std::string > const&);
-void ungrab_gst_syms();
-
-#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) extern RTN (*ll##GSTSYM)(__VA_ARGS__);
-#include "llmediaimplgstreamer_syms_raw.inc"
-#undef LL_GST_SYM
-
-// regrettable hacks to give us better runtime compatibility with older systems
-#define llg_return_if_fail(COND) do{if (!(COND)) return;}while(0)
-#define llg_return_val_if_fail(COND,V) do{if (!(COND)) return V;}while(0)
-
-// regrettable hacks because GStreamer was not designed for runtime loading
-#undef GST_TYPE_MESSAGE
-#define GST_TYPE_MESSAGE (llgst_message_get_type())
-#undef GST_TYPE_OBJECT
-#define GST_TYPE_OBJECT (llgst_object_get_type())
-#undef GST_TYPE_PIPELINE
-#define GST_TYPE_PIPELINE (llgst_pipeline_get_type())
-#undef GST_TYPE_ELEMENT
-#define GST_TYPE_ELEMENT (llgst_element_get_type())
-#undef GST_TYPE_VIDEO_SINK
-#define GST_TYPE_VIDEO_SINK (llgst_video_sink_get_type())
-// more regrettable hacks to stub-out these .h-exposed GStreamer internals
-void ll_gst_debug_register_funcptr(GstDebugFuncPtr func, gchar* ptrname);
-#undef _gst_debug_register_funcptr
-#define _gst_debug_register_funcptr ll_gst_debug_register_funcptr
-GstDebugCategory* ll_gst_debug_category_new(gchar *name, guint color, gchar *description);
-#undef _gst_debug_category_new
-#define _gst_debug_category_new ll_gst_debug_category_new
-#undef __gst_debug_enabled
-#define __gst_debug_enabled (0)
-
-// more hacks
-#define LLGST_MESSAGE_TYPE_NAME(M) (llgst_message_type_get_name(GST_MESSAGE_TYPE(M)))
diff --git a/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms_raw.inc b/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms_raw.inc
index 155eeb6809..e5abf22203 100644
--- a/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms_raw.inc
+++ b/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms_raw.inc
@@ -1,68 +1,67 @@
-LL_GST_SYM(true, gst_buffer_new, GstBuffer*, void)
-LL_GST_SYM(true, gst_structure_set_value, void, GstStructure *, const gchar *, const GValue*)
-LL_GST_SYM(true, gst_init_check, gboolean, int *argc, char **argv[], GError ** err)
-LL_GST_SYM(true, gst_message_get_type, GType, void)
-LL_GST_SYM(true, gst_message_type_get_name, const gchar*, GstMessageType type)
-LL_GST_SYM(true, gst_message_parse_error, void, GstMessage *message, GError **gerror, gchar **debug)
-LL_GST_SYM(true, gst_message_parse_warning, void, GstMessage *message, GError **gerror, gchar **debug)
-LL_GST_SYM(true, gst_message_parse_state_changed, void, GstMessage *message, GstState *oldstate, GstState *newstate, GstState *pending)
-LL_GST_SYM(true, gst_element_set_state, GstStateChangeReturn, GstElement *element, GstState state)
-LL_GST_SYM(true, gst_object_unref, void, gpointer object)
-LL_GST_SYM(true, gst_object_get_type, GType, void)
-LL_GST_SYM(true, gst_pipeline_get_type, GType, void)
-LL_GST_SYM(true, gst_pipeline_get_bus, GstBus*, GstPipeline *pipeline)
-LL_GST_SYM(true, gst_bus_add_watch, guint, GstBus * bus, GstBusFunc func, gpointer user_data)
-LL_GST_SYM(true, gst_element_factory_make, GstElement*, const gchar *factoryname, const gchar *name)
-LL_GST_SYM(true, gst_element_get_type, GType, void)
-LL_GST_SYM(true, gst_static_pad_template_get, GstPadTemplate*, GstStaticPadTemplate *pad_template)
-LL_GST_SYM(true, gst_element_class_add_pad_template, void, GstElementClass *klass, GstPadTemplate *temp)
-LL_GST_SYM(true, gst_caps_from_string, GstCaps *, const gchar *string)
-LL_GST_SYM(true, gst_caps_get_structure, GstStructure *, const GstCaps *caps, guint index)
-LL_GST_SYM(true, gst_element_register, gboolean, GstPlugin *plugin, const gchar *name, guint rank, GType type)
-LL_GST_SYM(true, gst_structure_get_int, gboolean, const GstStructure *structure, const gchar *fieldname, gint *value)
-LL_GST_SYM(true, gst_structure_get_value, const GValue *, const GstStructure *structure, const gchar *fieldname)
-LL_GST_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value)
-LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value)
-LL_GST_SYM(true, gst_structure_get_name, const gchar *, const GstStructure *structure)
-LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64)
+LL_GRAB_SYM(true, gst_buffer_new, GstBuffer*, void)
+LL_GRAB_SYM(true, gst_structure_set_value, void, GstStructure *, const gchar *, const GValue*)
+LL_GRAB_SYM(true, gst_init_check, gboolean, int *argc, char **argv[], GError ** err)
+LL_GRAB_SYM(true, gst_message_get_type, GType, void)
+LL_GRAB_SYM(true, gst_message_type_get_name, const gchar*, GstMessageType type)
+LL_GRAB_SYM(true, gst_message_parse_error, void, GstMessage *message, GError **gerror, gchar **debug)
+LL_GRAB_SYM(true, gst_message_parse_warning, void, GstMessage *message, GError **gerror, gchar **debug)
+LL_GRAB_SYM(true, gst_message_parse_state_changed, void, GstMessage *message, GstState *oldstate, GstState *newstate, GstState *pending)
+LL_GRAB_SYM(true, gst_element_set_state, GstStateChangeReturn, GstElement *element, GstState state)
+LL_GRAB_SYM(true, gst_object_unref, void, gpointer object)
+LL_GRAB_SYM(true, gst_object_get_type, GType, void)
+LL_GRAB_SYM(true, gst_pipeline_get_type, GType, void)
+LL_GRAB_SYM(true, gst_pipeline_get_bus, GstBus*, GstPipeline *pipeline)
+LL_GRAB_SYM(true, gst_bus_add_watch, guint, GstBus * bus, GstBusFunc func, gpointer user_data)
+LL_GRAB_SYM(true, gst_element_factory_make, GstElement*, const gchar *factoryname, const gchar *name)
+LL_GRAB_SYM(true, gst_element_get_type, GType, void)
+LL_GRAB_SYM(true, gst_static_pad_template_get, GstPadTemplate*, GstStaticPadTemplate *pad_template)
+LL_GRAB_SYM(true, gst_element_class_add_pad_template, void, GstElementClass *klass, GstPadTemplate *temp)
+LL_GRAB_SYM(true, gst_caps_from_string, GstCaps *, const gchar *string)
+LL_GRAB_SYM(true, gst_caps_get_structure, GstStructure *, const GstCaps *caps, guint index)
+LL_GRAB_SYM(true, gst_element_register, gboolean, GstPlugin *plugin, const gchar *name, guint rank, GType type)
+LL_GRAB_SYM(true, gst_structure_get_int, gboolean, const GstStructure *structure, const gchar *fieldname, gint *value)
+LL_GRAB_SYM(true, gst_structure_get_value, const GValue *, const GstStructure *structure, const gchar *fieldname)
+LL_GRAB_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value)
+LL_GRAB_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value)
+LL_GRAB_SYM(true, gst_structure_get_name, const gchar *, const GstStructure *structure)
+LL_GRAB_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64)
 
-LL_GST_SYM(false, gst_registry_fork_set_enabled, void, gboolean enabled)
-LL_GST_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled)
-LL_GST_SYM(false, gst_message_parse_buffering, void, GstMessage *message, gint *percent)
-LL_GST_SYM(false, gst_message_parse_info, void, GstMessage *message, GError **gerror, gchar **debug)
-LL_GST_SYM(false, gst_element_query_position, gboolean, GstElement *element, GstFormat *format, gint64 *cur)
-LL_GST_SYM(false, gst_version, void, guint *major, guint *minor, guint *micro, guint *nano)
+LL_GRAB_SYM(false, gst_registry_fork_set_enabled, void, gboolean enabled)
+LL_GRAB_SYM(false, gst_segtrap_set_enabled, void, gboolean enabled)
+LL_GRAB_SYM(false, gst_message_parse_buffering, void, GstMessage *message, gint *percent)
+LL_GRAB_SYM(false, gst_message_parse_info, void, GstMessage *message, GError **gerror, gchar **debug)
+LL_GRAB_SYM(false, gst_element_query_position, gboolean, GstElement *element, GstFormat *format, gint64 *cur)
+LL_GRAB_SYM(false, gst_version, void, guint *major, guint *minor, guint *micro, guint *nano)
 
-LL_GST_SYM( true, gst_message_parse_tag, void, GstMessage *, GstTagList **)
-LL_GST_SYM( true, gst_tag_list_foreach, void, const GstTagList *, GstTagForeachFunc, gpointer)
-LL_GST_SYM( true, gst_tag_list_get_tag_size, guint, const GstTagList *, const gchar *)
-LL_GST_SYM( true, gst_tag_list_get_value_index, const GValue *, const GstTagList *, const gchar *, guint)
+LL_GRAB_SYM( true, gst_message_parse_tag, void, GstMessage *, GstTagList **)
+LL_GRAB_SYM( true, gst_tag_list_foreach, void, const GstTagList *, GstTagForeachFunc, gpointer)
+LL_GRAB_SYM( true, gst_tag_list_get_tag_size, guint, const GstTagList *, const gchar *)
+LL_GRAB_SYM( true, gst_tag_list_get_value_index, const GValue *, const GstTagList *, const gchar *, guint)
 
-LL_GST_SYM( true, gst_caps_new_simple, GstCaps*, const char *, const char*, ... )
+LL_GRAB_SYM( true, gst_caps_new_simple, GstCaps*, const char *, const char*, ... )
 
-LL_GST_SYM( true, gst_sample_get_caps, GstCaps*, GstSample* )
-LL_GST_SYM( true, gst_sample_get_buffer, GstBuffer*, GstSample* )
-LL_GST_SYM( true, gst_buffer_map, gboolean, GstBuffer*, GstMapInfo*, GstMapFlags )
-LL_GST_SYM( true, gst_buffer_unmap, void, GstBuffer*, GstMapInfo* )
+LL_GRAB_SYM( true, gst_sample_get_caps, GstCaps*, GstSample* )
+LL_GRAB_SYM( true, gst_sample_get_buffer, GstBuffer*, GstSample* )
+LL_GRAB_SYM( true, gst_buffer_map, gboolean, GstBuffer*, GstMapInfo*, GstMapFlags )
+LL_GRAB_SYM( true, gst_buffer_unmap, void, GstBuffer*, GstMapInfo* )
 
-LL_GST_SYM( true, gst_app_sink_set_caps, void, GstAppSink*, GstCaps const* )
-LL_GST_SYM( true, gst_app_sink_pull_sample, GstSample*, GstAppSink* )
+LL_GRAB_SYM( true, gst_app_sink_set_caps, void, GstAppSink*, GstCaps const* )
+LL_GRAB_SYM( true, gst_app_sink_pull_sample, GstSample*, GstAppSink* )
 
-LL_GST_SYM( true, g_free, void, gpointer )
-LL_GST_SYM( true, g_error_free, void, GError* )
+LL_GRAB_SYM( true, g_free, void, gpointer )
+LL_GRAB_SYM( true, g_error_free, void, GError* )
 
-LL_GST_SYM( true, g_main_context_pending, gboolean, GMainContext* )
-LL_GST_SYM( true, g_main_loop_get_context, GMainContext*, GMainLoop* )
-LL_GST_SYM( true, g_main_context_iteration, gboolean, GMainContext*, gboolean )
-LL_GST_SYM( true, g_main_loop_new, GMainLoop*, GMainContext*, gboolean )
-LL_GST_SYM( true, g_main_loop_quit, void, GMainLoop* )
-LL_GST_SYM( true, gst_mini_object_unref, void, GstMiniObject* )
-LL_GST_SYM( true, g_object_set, void, gpointer, gchar const*, ... )
-LL_GST_SYM( true, g_source_remove, gboolean, guint )
-LL_GST_SYM( true, g_value_get_string, gchar const*, GValue const* )
+LL_GRAB_SYM( true, g_main_context_pending, gboolean, GMainContext* )
+LL_GRAB_SYM( true, g_main_loop_get_context, GMainContext*, GMainLoop* )
+LL_GRAB_SYM( true, g_main_context_iteration, gboolean, GMainContext*, gboolean )
+LL_GRAB_SYM( true, g_main_loop_new, GMainLoop*, GMainContext*, gboolean )
+LL_GRAB_SYM( true, g_main_loop_quit, void, GMainLoop* )
+LL_GRAB_SYM( true, gst_mini_object_unref, void, GstMiniObject* )
+LL_GRAB_SYM( true, g_object_set, void, gpointer, gchar const*, ... )
+LL_GRAB_SYM( true, g_source_remove, gboolean, guint )
+LL_GRAB_SYM( true, g_value_get_string, gchar const*, GValue const* )
 
-
-LL_GST_SYM( true, gst_debug_set_active, void, gboolean )
-LL_GST_SYM( true, gst_debug_add_log_function, void, GstLogFunction, gpointer, GDestroyNotify )
-LL_GST_SYM( true, gst_debug_set_default_threshold, void, GstDebugLevel )
-LL_GST_SYM( true, gst_debug_message_get , gchar const*, GstDebugMessage * )
\ No newline at end of file
+LL_GRAB_SYM( true, gst_debug_set_active, void, gboolean )
+LL_GRAB_SYM( true, gst_debug_add_log_function, void, GstLogFunction, gpointer, GDestroyNotify )
+LL_GRAB_SYM( true, gst_debug_set_default_threshold, void, GstDebugLevel )
+LL_GRAB_SYM( true, gst_debug_message_get , gchar const*, GstDebugMessage * )
\ No newline at end of file
diff --git a/indra/media_plugins/gstreamer10/media_plugin_gstreamer10.cpp b/indra/media_plugins/gstreamer10/media_plugin_gstreamer10.cpp
index 07bfb67283..dbc544d96b 100644
--- a/indra/media_plugins/gstreamer10/media_plugin_gstreamer10.cpp
+++ b/indra/media_plugins/gstreamer10/media_plugin_gstreamer10.cpp
@@ -43,9 +43,9 @@ extern "C" {
 #include <gst/app/gstappsink.h>
 
 }
+SymbolGrabber gSymbolGrabber;
 
-#include "llmediaimplgstreamer.h"
-#include "llmediaimplgstreamer_syms.h"
+#include "llmediaimplgstreamer_syms_raw.inc"
 
 static inline void llgst_caps_unref( GstCaps * caps )
 {
@@ -139,9 +139,9 @@ MediaPluginGStreamer10::MediaPluginGStreamer10( LLPluginInstance::sendMessageFun
     , mBusWatchID ( 0 )
     , mSeekWanted(false)
     , mSeekDestination(0.0)
-    , mPump ( NULL )
-    , mPlaybin ( NULL )
-    , mAppSink ( NULL )
+    , mPump ( nullptr )
+    , mPlaybin ( nullptr )
+    , mAppSink ( nullptr )
     , mCommand ( COMMAND_NONE )
 {
 }
@@ -193,8 +193,8 @@ gboolean MediaPluginGStreamer10::processGSTEvents(GstBus *bus, GstMessage *messa
         }
         case GST_MESSAGE_ERROR:
         {
-            GError *err = NULL;
-            gchar *debug = NULL;
+            GError *err = nullptr;
+            gchar *debug = nullptr;
 
             llgst_message_parse_error (message, &err, &debug);
             if (err)
@@ -211,8 +211,8 @@ gboolean MediaPluginGStreamer10::processGSTEvents(GstBus *bus, GstMessage *messa
         {
             if (llgst_message_parse_info)
             {
-                GError *err = NULL;
-                gchar *debug = NULL;
+                GError *err = nullptr;
+                gchar *debug = nullptr;
             
                 llgst_message_parse_info (message, &err, &debug);
                 if (err)
@@ -223,8 +223,8 @@ gboolean MediaPluginGStreamer10::processGSTEvents(GstBus *bus, GstMessage *messa
         }
         case GST_MESSAGE_WARNING:
         {
-            GError *err = NULL;
-            gchar *debug = NULL;
+            GError *err = nullptr;
+            gchar *debug = nullptr;
             
             llgst_message_parse_warning (message, &err, &debug);
             if (err)
@@ -293,13 +293,13 @@ bool MediaPluginGStreamer10::navigateTo ( const std::string urlIn )
 
     mSeekWanted = false;
 
-    if (NULL == mPump ||  NULL == mPlaybin)
+    if (nullptr == mPump ||  nullptr == mPlaybin)
     {
         setStatus(STATUS_ERROR);
         return false; // error
     }
 
-    llg_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), NULL);
+    llg_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), nullptr);
 
     // navigateTo implicitly plays, too.
     play(1.0);
@@ -328,7 +328,7 @@ bool MediaPluginGStreamer10::update(int milliseconds)
     //  DEBUGMSG("updating media...");
     
     // sanity check
-    if (NULL == mPump || NULL == mPlaybin)
+    if (nullptr == mPump || nullptr == mPlaybin)
     {
         return false;
     }
@@ -475,7 +475,7 @@ bool MediaPluginGStreamer10::setVolume( float volume )
     mVolume = volume;
     if (mDoneInit && mPlaybin)
     {
-        llg_object_set(mPlaybin, "volume", mVolume, NULL);
+        llg_object_set(mPlaybin, "volume", mVolume, nullptr);
         return true;
     }
 
@@ -549,7 +549,7 @@ bool MediaPluginGStreamer10::load()
     mVolume = 0.1234567f; // minor hack to force an initial volume update
 
     // Create a pumpable main-loop for this media
-    mPump = llg_main_loop_new (NULL, FALSE);
+    mPump = llg_main_loop_new (nullptr, FALSE);
     if (!mPump)
     {
         setStatus(STATUS_ERROR);
@@ -582,7 +582,7 @@ bool MediaPluginGStreamer10::load()
                                             "format", G_TYPE_STRING, "RGB",
                                             "width", G_TYPE_INT, INTERNAL_TEXTURE_SIZE,
                                             "height", G_TYPE_INT, INTERNAL_TEXTURE_SIZE,
-                                            NULL );
+                                            nullptr );
 
     llgst_app_sink_set_caps( mAppSink, pCaps );
     llgst_caps_unref( pCaps );
@@ -593,7 +593,7 @@ bool MediaPluginGStreamer10::load()
         return false;
     }
     
-    llg_object_set(mPlaybin, "video-sink", mAppSink, NULL);
+    llg_object_set(mPlaybin, "video-sink", mAppSink, nullptr);
 
     return true;
 }
@@ -611,16 +611,16 @@ bool MediaPluginGStreamer10::unload ()
     {
         llgst_element_set_state (mPlaybin, GST_STATE_NULL);
         llgst_object_unref (GST_OBJECT (mPlaybin));
-        mPlaybin = NULL;
+        mPlaybin = nullptr;
     }
 
     if (mPump)
     {
         llg_main_loop_quit(mPump);
-        mPump = NULL;
+        mPump = nullptr;
     }
 
-    mAppSink = NULL;
+    mAppSink = nullptr;
 
     setStatus(STATUS_NONE);
 
@@ -628,20 +628,15 @@ bool MediaPluginGStreamer10::unload ()
 }
 
 void LogFunction(GstDebugCategory *category, GstDebugLevel level, const gchar *file, const gchar *function, gint line, GObject *object, GstDebugMessage *message, gpointer user_data )
-#ifndef LL_LINUX // Docu says we need G_GNUC_NO_INSTRUMENT, but GCC says 'error'
-    G_GNUC_NO_INSTRUMENT
-#endif
 {
-#ifdef LL_LINUX
     std::cerr << file << ":" << line << "(" << function << "): " << llgst_debug_message_get( message ) << std::endl;
-#endif
 }
 
 //static
 bool MediaPluginGStreamer10::startup()
 {
     // first - check if GStreamer is explicitly disabled
-    if (NULL != getenv("LL_DISABLE_GSTREAMER"))
+    if (nullptr != getenv("LL_DISABLE_GSTREAMER"))
         return false;
 
     // only do global GStreamer initialization once.
@@ -651,28 +646,18 @@ bool MediaPluginGStreamer10::startup()
 
         // Get symbols!
         std::vector< std::string > vctDSONames;
-#if LL_DARWIN
-#elif LL_WINDOWS
-        vctDSONames.push_back( "libgstreamer-1.0-0.dll"  );
-        vctDSONames.push_back( "libgstapp-1.0-0.dll"  );
-        vctDSONames.push_back( "libglib-2.0-0.dll" );
-        vctDSONames.push_back( "libgobject-2.0-0.dll" );
-#else // linux or other ELFy unixoid
         vctDSONames.push_back( "libgstreamer-1.0.so.0"  );
         vctDSONames.push_back( "libgstapp-1.0.so.0"  );
         vctDSONames.push_back( "libglib-2.0.so.0" );
         vctDSONames.push_back( "libgobject-2.0.so" );
-#endif
-        if( !grab_gst_syms( vctDSONames ) )
-        {
+        if( !gSymbolGrabber.grabSymbols( vctDSONames ) )
             return false;
-        }
 
         if (llgst_segtrap_set_enabled)
         {
             llgst_segtrap_set_enabled(FALSE);
         }
-#if LL_LINUX
+
         // Gstreamer tries a fork during init, waitpid-ing on it,
         // which conflicts with any installed SIGCHLD handler...
         struct sigaction tmpact, oldact;
@@ -689,36 +674,29 @@ bool MediaPluginGStreamer10::startup()
             tmpact.sa_flags = SA_SIGINFO;
             sigaction(SIGCHLD, &tmpact, &oldact);
         }
-#endif // LL_LINUX
         // Protect against GStreamer resetting the locale, yuck.
         static std::string saved_locale;
-        saved_locale = setlocale(LC_ALL, NULL);
+        saved_locale = setlocale(LC_ALL, nullptr);
         
-//      _putenv_s( "GST_PLUGIN_PATH", "E:\\gstreamer\\1.0\\x86\\lib\\gstreamer-1.0" );
-
         llgst_debug_set_default_threshold( GST_LEVEL_WARNING );
-        llgst_debug_add_log_function( LogFunction, NULL, NULL );
+        llgst_debug_add_log_function( LogFunction, nullptr, nullptr );
         llgst_debug_set_active( false );
 
         // finally, try to initialize GStreamer!
-        GError *err = NULL;
-        gboolean init_gst_success = llgst_init_check(NULL, NULL, &err);
+        GError *err = nullptr;
+        gboolean init_gst_success = llgst_init_check(nullptr, nullptr, &err);
 
         // restore old locale
         setlocale(LC_ALL, saved_locale.c_str() );
 
-#if LL_LINUX
         // restore old SIGCHLD handler
         if (!llgst_registry_fork_set_enabled)
-            sigaction(SIGCHLD, &oldact, NULL);
-#endif // LL_LINUX
+            sigaction(SIGCHLD, &oldact, nullptr);
 
         if (!init_gst_success) // fail
         {
             if (err)
-            {
                 llg_error_free(err);
-            }
             return false;
         }
         
@@ -734,8 +712,7 @@ bool MediaPluginGStreamer10::closedown()
     if (!mDoneInit)
         return false; // error
 
-    ungrab_gst_syms();
-
+    gSymbolGrabber.ungrabSymbols();
     mDoneInit = false;
 
     return true;
@@ -746,7 +723,6 @@ MediaPluginGStreamer10::~MediaPluginGStreamer10()
     closedown();
 }
 
-
 std::string MediaPluginGStreamer10::getVersion()
 {
     std::string plugin_version = "GStreamer10 media plugin, GStreamer version ";
@@ -823,7 +799,7 @@ void MediaPluginGStreamer10::receiveMessage(const char *message_string)
                     if(mPixels == iter->second.mAddress)
                     {
                         // This is the currently active pixel buffer.  Make sure we stop drawing to it.
-                        mPixels = NULL;
+                        mPixels = nullptr;
                         mTextureSegmentName.clear();
                     }
                     mSharedSegments.erase(iter);
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index a3c1c4ef99..eaf9dde981 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -13,13 +13,6 @@ include(LibVLCPlugin)
 
 ### media_plugin_libvlc
 
-if(NOT ADDRESS_SIZE EQUAL 32)
-  if(WINDOWS)
-    ##add_definitions(/FIXED:NO)
-  else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-    add_definitions(-fPIC)
-  endif(WINDOWS)
-endif(NOT ADDRESS_SIZE EQUAL 32)
 
 set(media_plugin_libvlc_SOURCE_FILES
     media_plugin_libvlc.cpp
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f359bebb17..e6ac84d5ab 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2384,4 +2384,3 @@ if (LL_TESTS)
 endif (LL_TESTS)
 
 check_message_template(${VIEWER_BINARY_NAME})
-
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index eb3ead433b..7d26c81283 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -58,17 +58,6 @@ fi
 ## - Avoids an often-buggy X feature that doesn't really benefit us anyway.
 export SDL_VIDEO_X11_DGAMOUSE=0
 
-## - Works around a problem with misconfigured 64-bit systems not finding GL
-I386_MULTIARCH="$(dpkg-architecture -ai386 -qDEB_HOST_MULTIARCH 2>/dev/null)"
-MULTIARCH_ERR=$?
-if [ $MULTIARCH_ERR -eq 0 ]; then
-    echo 'Multi-arch support detected.'
-    MULTIARCH_GL_DRIVERS="/usr/lib/${I386_MULTIARCH}/dri"
-    export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH}:${MULTIARCH_GL_DRIVERS}:/usr/lib64/dri:/usr/lib32/dri:/usr/lib/dri"
-else
-    export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH}:/usr/lib64/dri:/usr/lib32/dri:/usr/lib/dri"
-fi
-
 ## - The 'scim' GTK IM module widely crashes the viewer.  Avoid it.
 if [ "$GTK_IM_MODULE" = "scim" ]; then
     export GTK_IM_MODULE=xim
@@ -98,25 +87,6 @@ cd "${RUN_PATH}"
 ## Before we mess with LD_LIBRARY_PATH, save the old one to restore for
 ##  subprocesses that care.
 export SAVED_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
-
-# if [ -n "$LL_TCMALLOC" ]; then
-#    tcmalloc_libs='/usr/lib/libtcmalloc.so.0 /usr/lib/libstacktrace.so.0 /lib/libpthread.so.0'
-#    all=1
-#    for f in $tcmalloc_libs; do
-#        if [ ! -f $f ]; then
-#	    all=0
-#	fi
-#    done
-#    if [ $all != 1 ]; then
-#        echo 'Cannot use tcmalloc libraries: components missing' 1>&2
-#    else
-#	export LD_PRELOAD=$(echo $tcmalloc_libs | tr ' ' :)
-#	if [ -z "$HEAPCHECK" -a -z "$HEAPPROFILE" ]; then
-#	    export HEAPCHECK=${HEAPCHECK:-normal}
-#	fi
-#    fi
-#fi
-
 export LD_LIBRARY_PATH="$PWD/lib:${LD_LIBRARY_PATH}"
 
 # Copy "$@" to ARGS array specifically to delete the --skip-gridargs switch.
@@ -140,18 +110,6 @@ LL_RUN_ERR=$?
 if [ $LL_RUN_ERR -ne 0 ]; then
 	# generic error running the binary
 	echo '*** Bad shutdown ($LL_RUN_ERR). ***'
-	if [ "$(uname -m)" = "x86_64" ]; then
-		echo
-		cat << EOFMARKER
-You are running the Second Life Viewer on a x86_64 platform.  The
-most common problems when launching the Viewer (particularly
-'bin/do-not-directly-run-secondlife-bin: not found' and 'error while
-loading shared libraries') may be solved by installing your Linux
-distribution's 32-bit compatibility packages.
-For example, on Ubuntu and other Debian-based Linuxes you might run:
-$ sudo apt-get install ia32-libs ia32-libs-gtk ia32-libs-kde ia32-libs-sdl
-EOFMARKER
-	fi
 fi
 
 echo
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index a1fecdb981..4099f8bc7d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1130,7 +1130,7 @@ bool LLAppViewer::init()
 
 	gGLActive = FALSE;
 
-#if LL_RELEASE_FOR_DOWNLOAD
+#if LL_RELEASE_FOR_DOWNLOAD && !LL_LINUX
     // Skip updater if this is a non-interactive instance
     if (!gSavedSettings.getBOOL("CmdLineSkipUpdater") && !gNonInteractive)
     {
@@ -5662,4 +5662,3 @@ void LLAppViewer::metricsSend(bool enable_reporting)
 	// resolution in time.
 	gViewerAssetStats->restart();
 }
-
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 59701cc5b3..3791d1e754 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1739,9 +1739,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		}
 		else if(LLFile::stat(plugin_name, &s))
 		{
-#if !LL_LINUX
 			LL_WARNS_ONCE("Media") << "Couldn't find plugin at " << plugin_name << LL_ENDL;
-#endif
 		}
 		else
 		{
@@ -1795,9 +1793,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 			}
 		}
 	}
-#if !LL_LINUX
 	LL_WARNS_ONCE("Plugin") << "plugin initialization failed for mime type: " << media_type << LL_ENDL;
-#endif
 
 	if(gAgent.isInitialized())
 	{
diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml
index 7188b1e699..22a0024874 100644
--- a/indra/newview/skins/default/xui/en/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml
@@ -7,7 +7,7 @@
 		none
 	</defaultwidget>
 	<defaultimpl>
-		media_plugin_webkit
+		media_plugin_cef
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
@@ -130,7 +130,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -141,7 +141,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -152,7 +152,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
@@ -163,7 +163,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -174,7 +174,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -185,7 +185,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
@@ -196,7 +196,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -207,7 +207,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
@@ -218,7 +218,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -229,7 +229,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
@@ -240,7 +240,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -251,7 +251,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
@@ -262,7 +262,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -273,7 +273,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -284,7 +284,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
@@ -295,7 +295,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -306,7 +306,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -317,7 +317,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -328,7 +328,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -339,7 +339,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
@@ -350,7 +350,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
@@ -361,7 +361,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/png">
@@ -372,7 +372,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
@@ -383,7 +383,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
@@ -394,7 +394,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/html">
@@ -405,7 +405,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
@@ -416,7 +416,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="text/xml">
@@ -427,7 +427,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
@@ -438,7 +438,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -449,7 +449,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
@@ -460,7 +460,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -471,7 +471,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -482,7 +482,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -493,7 +493,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_libvlc
+			media_plugin_gstreamer
 		</impl>
 	</mimetype>
 </mimetypes>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c97d421504..6fae39db30 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1243,20 +1243,20 @@ class LinuxManifest(ViewerManifest):
                 self.path("secondlife_256.BMP","ll_icon.BMP")
 
         # plugins
-        #with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'media_plugins'), dst="bin/llplugin"):
-        #    self.path("gstreamer10/libmedia_plugin_gstreamer10.so", "libmedia_plugin_gstreamer.so")
+        with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'media_plugins'), dst="bin/llplugin"):
+            self.path("gstreamer10/libmedia_plugin_gstreamer10.so", "libmedia_plugin_gstreamer.so")
 
 
-        """
-        Once we got CEF enable this
         with self.prefix(src=os.path.join(self.args['build'], os.pardir, 'media_plugins'), dst="bin/llplugin"):
             self.path("cef/libmedia_plugin_cef.so", "libmedia_plugin_cef.so" )
         with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"):
             self.path( "libcef.so" )
-        with self.prefix(src=os.path.join(pkgdir, 'lib', 'release', 'swiftshader'), dst=os.path.join("bin", "swiftshader") ):
-            self.path( "*.so" )
-        with self.prefix(src=os.path.join(pkgdir, 'lib', 'release', 'swiftshader'), dst=os.path.join("lib", "swiftshader") ):
-            self.path( "*.so" )
+
+            self.path( "libEGL*" )
+            self.path( "libvulkan*" )
+            self.path( "libvk_swiftshader*" )
+            self.path( "libGLESv2*" )
+            self.path( "vk_swiftshader_icd.json")
 
         with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="bin"):
             self.path( "chrome-sandbox" )
@@ -1267,18 +1267,13 @@ class LinuxManifest(ViewerManifest):
             self.path( "snapshot_blob.bin" )
             self.path( "v8_context_snapshot.bin" )
 
-        with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="bin"):
-            self.path( "chrome_100_percent.pak" )
-            self.path( "chrome_200_percent.pak" )
-            self.path( "resources.pak" )
-            self.path( "icudtl.dat" )
         with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="lib"):
             self.path( "chrome_100_percent.pak" )
             self.path( "chrome_200_percent.pak" )
             self.path( "resources.pak" )
             self.path( "icudtl.dat" )
 
-        with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')):
+        with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('lib', 'locales')):
             self.path("am.pak")
             self.path("ar.pak")
             self.path("bg.pak")
@@ -1332,7 +1327,6 @@ class LinuxManifest(ViewerManifest):
             self.path("vi.pak")
             self.path("zh-CN.pak")
             self.path("zh-TW.pak")
-        """
 
         self.path("featuretable_linux.txt")
         self.path("cube.dae")