Merge branch 'gst-revamp' into next

43 files changed, 1005 insertions, 599 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index beb0629..68fb3ca 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,9 +1,298 @@
+2009-04-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        LLMediaImplGStreamer creates new thread for playing.
+        This keeps the viewer responsive while GStreamer does its thing.
+        * linden/indra/llmedia/llmediaimplgstreamer.h:
+        Ditto.
+
+
+        * linden/indra/llmedia/llgstplaythread.cpp: 
+        Added LLGstPlayThread class.
+        * linden/indra/llmedia/llgstplaythread.h: 
+        Ditto.
+        * linden/indra/llmedia/CMakeLists.txt: 
+        Ditto.
+
+
+2009-04-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Refactored the heart of the GST play code to startPlay().
+
+
+2009-04-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llviewermedia.cpp:
+        Apply saved MediaDebugLevel at media init time.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Plugged in LLMediaImplGStreamer::gstreamer_log().
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Implemented LLMediaImplGStreamer::gstreamer_log().
+        * linden/indra/llmedia/llmediaimplgstreamer.h:
+        Ditto.
+
+
+        * linden/indra/newview/llviewercontrol.cpp:
+        Implemented handleMediaDebugLevelChanged hook.
+
+
+2009-04-01  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/app_settings/settings.xml:
+        Added MediaDebugLevel setting in XML (does nothing yet).
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp: 
+        Implemented LLMediaImplGstreamer::setDebugLevel().
+        * linden/indra/llmedia/llmediaimplgstreamer.h: 
+        Ditto.
+
+
+        * linden/indra/llmedia/llmediaimplcommon.cpp: 
+        Added LLMediaImplCommon::setDebugLevel().
+        * linden/indra/llmedia/llmediaimplcommon.h:
+        Ditto.
+
+
+        * linden/indra/llmedia/llmediabase.h:
+        Added LLMediaBase::EDebugLevel and setDebugLevel prototype.
+
+
+2009-03-30  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Cleaned up logic for bad streams.
+
+
+2009-03-29  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Added loading status to the log's plugin list.
+        set_gst_plugin_path now compiles for windows.
+
+
+        * linden/indra/newview/llappviewer.cpp:
+        Removed unnecessary headers.
+
+
+        * linden/indra/cmake/00-Common.cmake
+        Added VS optimizations to cmake
+        Added flag for multi-core compiling in VS2005
+
+
+2009-03-28  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Improved set_gst_plugin_path, more comprehensive path.
+        Also tried to tidy up a bit.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Moved Windows GST_PLUGIN_PATH setup to LLMediaImplGStreamer.
+        LLAppViewer::gst_plugin_path -->
+           LLMediaImplGStreamer::set_gst_plugin_path
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Ditto.
+        * linden/indra/newview/llappviewer.h:
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp:
+        Ditto.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Print out the plugins gstreamer finds, for debugging.
+
+
 2009-03-27  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/app_settings/settings.xml:
         Changed the login splash screen URL.
 
 
+2009-03-27  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Fixed video streams freezing the viewer.
+
+
+2009-03-26  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamervidplug.cpp:
+        Fixed/improved how slvideo gst plugin is registered.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer_syms.cpp:
+        Removed obsolete gstreamer_syms files.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms.h:
+        Ditto.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc:
+        Ditto.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc:
+        Ditto.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc:
+        Ditto.
+
+        
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Removed all that llgst and symbol grabbing silliness.
+        Some symbols require gstreamer >= 0.10.11.
+        * linden/indra/llmedia/llmediaimplgstreamervidplug.cpp:
+        Ditto.
+        * linden/indra/llmedia/CMakeLists.txt:
+        Ditto.
+
+
+        * linden/indra/cmake/GStreamer.cmake:
+        Link with some gstreamer core libs on Linux.
+
+
+2009-03-22  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llappviewer.cpp:
+        Removed slviewer-0-v12160-LostConnectionOnLogin.patch.
+
+        * linden/indra/newview/app_settings/settings.xml:
+        Removed slviewer-0-v12160-RememberStatsPosAndSize.patch.
+        * linden/indra/newview/lldebugview.cpp:
+        Ditto.
+        * linden/indra/newview/llfloaterstats.cpp:
+        Ditto.
+
+        * linden/indra/newview/llfloaterurldisplay.cpp:
+        Removed slviewer-0-v12160-VisitedLandmarks.patch.
+        * linden/indra/newview/llinventorybridge.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelinventory.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelplace.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelplace.h:
+        Ditto.
+        * linden/indra/newview/llpreviewlandmark.cpp:
+        Ditto.
+        * linden/indra/newview/llviewermessage.cpp:
+        Ditto.
+
+
+2009-03-16  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        Visual Studio now ignores C4244 warnings in GStreamer.
+        Since the change was intentional, I thought it best to
+        continue using "treat warnings as errors" and ignore it.
+        * linden/indra/llmedia/llmediaimplgstreamer_syms.cpp:
+        Ditto.
+        * linden/indra/llmedia/llmediamanager.cpp:
+        Ditto.
+
+
+2009-03-10  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llaudio/audioengine.cpp:
+        Changed startinternetstream() a bit to be clearer.
+
+
+2009-03-07  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llimagej2coj/llimagej2coj.cpp:
+        Backported fix for VWR-4070 from 1.22.
+
+        * linden/indra/llaudio/audioengine.cpp:
+        Applied patch by Zwagoth Klaar for muting sounds before decoding.
+        * linden/indra/newview/llviewermessage.cpp:
+        Ditto.
+
+        * linden/indra/llmessage/llhttpclient.cpp:
+        Applied memleak patch from VWR-9400 by Henri and Carjay.
+
+        * linden/indra/newview/app_settings/settings.xml:
+        Applied remember stats position and size patch
+        from Latif Khalifa (VWR-9540).
+        * linden/indra/newview/lldebugview.cpp:
+        Ditto.
+        * linden/indra/newview/llfloaterstats.cpp:
+        Ditto.
+
+        * linden/indra/newview/llappviewer.cpp:
+        Backported fix for VWR-8783, original patch by Gigs Taggart. 
+
+        * linden/indra/newview/llfloaterurldisplay.cpp:
+        Applied patch to correct landmark colors not changing
+        (VWR-7896) by Zi Ree.
+        * linden/indra/newview/llinventorybridge.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelinventory.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelplace.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelplace.h:
+        Ditto.
+        * linden/indra/newview/llpreviewlandmark.cpp:
+        Ditto.
+        * linden/indra/newview/llviewermessage.cpp:
+        Ditto.
+
+        * linden/indra/newview/llvoavatar.cpp:
+        Use std::string for nametags, removed bizarre name stacking option. 
+
+
+2009-03-01  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llfloaterchat.cpp:
+        Backported fix for VWR-6744 (No way to hide IMs in chat console).
+        * linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml:
+        Ditto.
+
+
+2009-02-28  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/skins/default/textures/textures.xml:
+        Fixed pause button texture showing up in certain instances.
+        * linden/indra/newview/skins/default/xui/de/panel_media_controls.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml:
+        Ditto.
+        * linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml:
+        Ditto.
+
+        * linden/indra/newview/llfilepicker.cpp:
+        Applied patch for VWR-5575 (crash in the file picker dealing
+        with accented characters and bad locale) by Alissa Sabre.
+
+        * linden/indra/newview/pipeline.cpp:
+        Backported possible crash fix while changing graphics settings from 1.22.
+
+        * linden/indra/llui/llfloater.cpp:
+        Backported possible crash fix in llfloater.cpp from 1.22.
+
+        * linden/indra/newview/lldrawable.cpp:
+        Backported fix for VWR-3871 (prim position appears to be off) from 1.22.
+
+        * linden/indra/newview/llcompilequeue.cpp:
+        Backported fix for SVC-2771 (script resetting can fail) from 1.22.
+        * linden/indra/newview/llviewermenu.cpp:
+        Ditto.
+
+        * linden/indra/llcharacter/llbvhloader.cpp:
+        Backported fix for VWR-996 (wrong visualisation of animations) from 1.22.
+
+        * linden/indra/newview/app_settings/keywords.ini:
+        Applied my patch for VWR-8454 (PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS
+        not highlighted in script editor).
+
+
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 =-                       1.1.0 RC2                        -=
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index c41591f..27838d6 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -57,6 +57,21 @@ if (WINDOWS)
       /Zc:wchar_t-
       )
   endif (MSVC80 OR MSVC90)
+
+  # VS optimization flags
+  if(MSVC80)
+
+    set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
+
+    set(CMAKE_CXX_FLAGS_RELEASE
+      "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
+      CACHE STRING "C++ compiler release options" FORCE)
+
+  add_definitions(
+      /MP${NUMBER_OF_CORES}
+      )
+
+  endif (MSVC80)
   
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index b4b984d..7b380a8 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -54,10 +54,6 @@ if (WINDOWS)
 
 else (WINDOWS)
 
-  include(FindPkgConfig)
-
-  pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
-  pkg_check_modules(GSTREAMER_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
   set(GSTREAMER_INCLUDE_DIRS
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
@@ -66,9 +62,11 @@ else (WINDOWS)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
 
-  # We don't need to explicitly link against gstreamer itself, because
-  # LLMediaImplGStreamer probes for the system's copy at runtime.
   set(GSTREAMER_LIBRARIES
+      gstvideo-0.10
+      gstaudio-0.10
+      gstbase-0.10
+      gstreamer-0.10
       gobject-2.0
       gmodule-2.0
       dl
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index 7bb65e9..438aefc 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -191,39 +191,43 @@ void LLAudioEngine::startInternetStream(const std::string& url)
                 if (mgr)
                 {
                         mInternetStreamMedia = mgr->createSourceFromMimeType(LLURI(url).scheme(), "audio/mpeg"); // assumes that whatever media implementation supports mp3 also supports vorbis.
-                        //LL_INFOS("AudioEngine") << "mInternetStreamMedia is now " << mInternetStreamMedia << llendl;
+                        LL_INFOS("AudioEngine") << "mInternetStreamMedia is now " << mInternetStreamMedia << llendl;
                 }
         }
 
         if(!mInternetStreamMedia)
+        {
                 return;
-
-        // Check for a dead stream, just in case
-        if(getStatus() == LLMediaBase::STATUS_DEAD)
+        }
+        // Check for a dead stream from gstreamer, just in case
+        else if(getStatus() == LLMediaBase::STATUS_DEAD)
         {
                 LL_INFOS("AudioEngine") << "don't play dead stream urls"<< llendl;
                 mInternetStreamURL.clear();
                 mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
                 mInternetStreamMedia->updateMedia();
                 stopInternetStream();
-                return;
         }
-        
-        if (!url.empty())
+        else if (url.empty())
         {
-                LL_INFOS("AudioEngine") << "Starting internet stream: " << url << llendl;
-                mInternetStreamURL = url;
-                mInternetStreamMedia->navigateTo ( url );
-                LL_INFOS("AudioEngine") << "Playing....." << llendl;            
-                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START);
+                LL_INFOS("AudioEngine") << "url is emptly. Setting stream to NULL"<< llendl;
+                mInternetStreamURL.clear();
+                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
                 mInternetStreamMedia->updateMedia();
-        } 
+        }
+        // Stream appears to be good, attempting to play
         else
         {
-                LL_INFOS("AudioEngine") << "setting stream to NULL"<< llendl;
-                mInternetStreamURL.clear();
-                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
+                // stop any other stream first
+                stopInternetStream();
+
+                LL_INFOS("AudioEngine") << "Starting internet stream: " << url << llendl;
+                mInternetStreamURL = url;
+                mInternetStreamMedia->navigateTo(url);
+                //LL_INFOS("AudioEngine") << "Playing....." << llendl;          
+                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START);
                 mInternetStreamMedia->updateMedia();
+                mStatus = LLMediaBase::STATUS_STARTED;
         }
 }
 
@@ -231,7 +235,8 @@ void LLAudioEngine::startInternetStream(const std::string& url)
 void LLAudioEngine::stopInternetStream()
 {
         LL_INFOS("AudioEngine") << "entered stopInternetStream()" << llendl;
-        
+        mInternetStreamURL.clear();
+
     if(mInternetStreamMedia)
         {
                 if(!mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP))
@@ -240,8 +245,6 @@ void LLAudioEngine::stopInternetStream()
                 }
                 mInternetStreamMedia->updateMedia();
         }
-
-        mInternetStreamURL.clear();
 }
 
 // virtual
@@ -879,7 +882,8 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
         // Create a new source (since this can't be associated with an existing source.
         //LL_INFOS("AudioEngine") << "Localized: " << audio_uuid << llendl;
 
-        if (mMuted)
+        //If we cannot hear it, dont even try to load the sound.
+        if (mMuted || gain == 0.0)
         {
                 return;
         }
diff --git a/linden/indra/llcharacter/llbvhloader.cpp b/linden/indra/llcharacter/llbvhloader.cpp
index cd1f492..938f47d 100644
--- a/linden/indra/llcharacter/llbvhloader.cpp
+++ b/linden/indra/llcharacter/llbvhloader.cpp
@@ -1133,6 +1133,8 @@ void LLBVHLoader::optimize()
 
                         F32 rot_threshold = ROTATION_KEYFRAME_THRESHOLD / llmax((F32)joint->mChildTreeMaxDepth * 0.33f, 1.f);
 
+                        double diff_max = 0;
+                        KeyVector::iterator ki_max = ki;
                         for (; ki != joint->mKeys.end(); ++ki)
                         {
                                 if (ki_prev == ki_last_good_pos)
@@ -1193,30 +1195,55 @@ void LLBVHLoader::optimize()
                                         F32 x_delta;
                                         F32 y_delta;
                                         F32 rot_test;
-
+                                        
+                                        // Test if the rotation has changed significantly since the very first frame.  If false
+                                        // for all frames, then we'll just throw out this joint's rotation entirely.
                                         x_delta = dist_vec(LLVector3::x_axis * first_frame_rot, LLVector3::x_axis * test_rot);
                                         y_delta = dist_vec(LLVector3::y_axis * first_frame_rot, LLVector3::y_axis * test_rot);
                                         rot_test = x_delta + y_delta;
-
                                         if (rot_test > ROTATION_MOTION_THRESHOLD)
                                         {
                                                 rot_changed = TRUE;
                                         }
-
                                         x_delta = dist_vec(LLVector3::x_axis * interp_rot, LLVector3::x_axis * test_rot);
                                         y_delta = dist_vec(LLVector3::y_axis * interp_rot, LLVector3::y_axis * test_rot);
                                         rot_test = x_delta + y_delta;
 
-                                        if (rot_test < rot_threshold)
-                                        {
-                                                ki_prev->mIgnoreRot = TRUE;
-                                                numRotFramesConsidered++;
-                                        }
-                                        else
+                                        // Draw a line between the last good keyframe and current.  Test the distance between the last frame (current-1, i.e. ki_prev)
+                                        // and the line.  If it's greater than some threshold, then it represents a significant frame and we want to include it.
+                                        if (rot_test >= rot_threshold ||
+                                                (ki+1 == joint->mKeys.end() && numRotFramesConsidered > 2))
                                         {
+                                                // Add the current test keyframe (which is technically the previous key, i.e. ki_prev).
                                                 numRotFramesConsidered = 2;
                                                 ki_last_good_rot = ki_prev;
                                                 joint->mNumRotKeys++;
+
+                                                // Add another keyframe between the last good keyframe and current, at whatever point was the most "significant" (i.e.
+                                                // had the largest deviation from the earlier tests).  Note that a more robust approach would be test all intermediate
+                                                // keyframes against the line between the last good keyframe and current, but we're settling for this other method
+                                                // because it's significantly faster.
+                                                if (diff_max > 0)
+                                                {
+                                                        if (ki_max->mIgnoreRot == TRUE)
+                                                        {
+                                                                ki_max->mIgnoreRot = FALSE;
+                                                                joint->mNumRotKeys++;
+                                                        }
+                                                        diff_max = 0;
+                                                }
+                                        }
+                                        else
+                                        {
+                                                // This keyframe isn't significant enough, throw it away.
+                                                ki_prev->mIgnoreRot = TRUE;
+                                                numRotFramesConsidered++;
+                                                // Store away the keyframe that has the largest deviation from the interpolated line, for insertion later.
+                                                if (rot_test > diff_max)
+                                                {
+                                                        diff_max = rot_test;
+                                                        ki_max = ki;
+                                                }
                                         }
                                 }
 
diff --git a/linden/indra/llimagej2coj/llimagej2coj.cpp b/linden/indra/llimagej2coj/llimagej2coj.cpp
index 983241c..a0c61d8 100644
--- a/linden/indra/llimagej2coj/llimagej2coj.cpp
+++ b/linden/indra/llimagej2coj/llimagej2coj.cpp
@@ -151,9 +151,11 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
         // dereference the array.
         if(!image || !image->numcomps)
         {
-                fprintf(stderr, "ERROR -> decodeImpl: failed to decode image!\n");
+                llwarns << "ERROR -> decodeImpl: failed to decode image!" << llendl;
                 if (image)
+                {
                         opj_image_destroy(image);
+                }
 
                 return TRUE; // done
         }
@@ -169,6 +171,17 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
                         return TRUE;
                 }
         }
+
+        if(image->numcomps <= first_channel)
+        {
+                llwarns << "trying to decode more channels than are present in image: numcomps: " << image->numcomps << " first_channel: " << first_channel << llendl;
+                if (image)
+                {
+                        opj_image_destroy(image);
+                }
+
+                return TRUE;
+        }
         
         // Copy image data into our raw image format (instead of the separate channel format
 
@@ -211,7 +224,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
                 }
                 else // Some rare OpenJPEG versions have this bug.
                 {
-                        fprintf(stderr, "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)\n");
+                        llwarns << "ERROR -> decodeImpl: failed to decode image! (NULL comp data - OpenJPEG bug)" << llendl;
                         opj_image_destroy(image);
 
                         return TRUE; // done
@@ -430,7 +443,7 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
 
         if(!image)
         {
-                fprintf(stderr, "ERROR -> getMetadata: failed to decode image!\n");
+                llwarns << "ERROR -> getMetadata: failed to decode image!" << llendl;
                 return FALSE;
         }
 
diff --git a/linden/indra/llmedia/CMakeLists.txt b/linden/indra/llmedia/CMakeLists.txt
index 026afc1..0e5b261 100644
--- a/linden/indra/llmedia/CMakeLists.txt
+++ b/linden/indra/llmedia/CMakeLists.txt
@@ -30,8 +30,8 @@ set(llmedia_SOURCE_FILES
     llmediaimplfactory.cpp
     llmediamanager.cpp
     llmediaimplgstreamer.cpp
-    llmediaimplgstreamer_syms.cpp
     llmediaimplgstreamervidplug.cpp
+    llgstplaythread.cpp
     )
     
 set(llmedia_HEADER_FILES
@@ -48,7 +48,7 @@ set(llmedia_HEADER_FILES
     llmediaobserver.h
     llmediaimplgstreamer.h
     llmediaimplgstreamervidplug.h
-    llmediaimplgstreamer_syms.h
+    llgstplaythread.h
     )
 
   # Work around a bad interaction between broken gstreamer headers and
diff --git a/linden/indra/llmedia/llgstplaythread.cpp b/linden/indra/llmedia/llgstplaythread.cpp
new file mode 100644
index 0000000..152f9d9
--- /dev/null
+++ b/linden/indra/llmedia/llgstplaythread.cpp
@@ -0,0 +1,54 @@
+/** 
+ * @file llgstplaythread.cpp
+ * @author Jacek Antonelli
+ * @brief GStreamer playback management thread class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Jacek Antonelli
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code.  View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * $/LicenseInfo$
+ */
+
+#include "llgstplaythread.h"
+#include "llmediaimplgstreamer.h"
+
+LLGstPlayThread::
+LLGstPlayThread( LLMediaImplCommon *impl,
+                 const std::string& name, apr_pool_t *poolp ):
+        LLThread( name, poolp ),
+        mMediaImpl( impl )
+{
+}
+
+
+LLGstPlayThread::~LLGstPlayThread()
+{
+}
+
+
+// virtual
+void LLGstPlayThread::run()
+{
+        ((LLMediaImplGStreamer *)mMediaImpl)->startPlay();
+}
diff --git a/linden/indra/llmedia/llgstplaythread.h b/linden/indra/llmedia/llgstplaythread.h
new file mode 100644
index 0000000..c3c36a7
--- /dev/null
+++ b/linden/indra/llmedia/llgstplaythread.h
@@ -0,0 +1,62 @@
+/** 
+ * @file llgstplaythread.h
+ * @author Jacek Antonelli
+ * @brief GStreamer playback management thread class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, Jacek Antonelli
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code.  View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * $/LicenseInfo$
+ */
+
+
+#ifndef LL_LLGSTPLAYTHREAD_H
+#define LL_LLGSTPLAYTHREAD_H
+
+#include "linden_common.h"
+
+#include "llthread.h"
+#include "llmediaimplcommon.h"
+
+class LLGstPlayThread: public LLThread
+{
+        public:
+
+                LLGstPlayThread( LLMediaImplCommon *impl,
+                                 const std::string& name, apr_pool_t *poolp );
+
+                ~LLGstPlayThread();
+
+                virtual void run();
+
+        private:
+
+                // Actually, this will really only be an LLMediaImplGStreamer.
+                // But we have to jump through some hoops to mutual pointer-holding.
+                // There may be a better way, but I don't have the motivation to find it.
+                LLMediaImplCommon *mMediaImpl;
+};
+
+
+#endif // LL_LLGSTPLAYTHREAD_H
diff --git a/linden/indra/llmedia/llmediabase.h b/linden/indra/llmedia/llmediabase.h
index b5b9420..bf54a22 100644
--- a/linden/indra/llmedia/llmediabase.h
+++ b/linden/indra/llmedia/llmediabase.h
@@ -61,6 +61,21 @@ class LLMediaBase
                 // undoes everything init() didm called by the media manager when destroying a source
                 virtual bool reset() = 0;
 
+
+                /* Mirrors GStreamer debug levels. */
+                enum EDebugLevel {
+                  DEBUG_LEVEL_NONE = 0,
+                  DEBUG_LEVEL_ERROR,
+                  DEBUG_LEVEL_WARNING,
+                  DEBUG_LEVEL_INFO,
+                  DEBUG_LEVEL_DEBUG,
+                  DEBUG_LEVEL_LOG,
+                  DEBUG_LEVEL_COUNT,
+                };
+
+    /* Set the debug verbosity level. Only implemented for GStreamer. */
+    virtual bool setDebugLevel( EDebugLevel level ) = 0;
+
                 // accessor for MIME type
                 virtual bool setMimeType( const std::string mime_type ) = 0;
                 virtual std::string getMimeType() const = 0;
diff --git a/linden/indra/llmedia/llmediaimplcommon.cpp b/linden/indra/llmedia/llmediaimplcommon.cpp
index abb61e1..48b3973 100644
--- a/linden/indra/llmedia/llmediaimplcommon.cpp
+++ b/linden/indra/llmedia/llmediaimplcommon.cpp
@@ -66,7 +66,8 @@ LLMediaImplCommon::LLMediaImplCommon() :
         mCommand( LLMediaBase::COMMAND_NONE ),
         mStatus( LLMediaBase::STATUS_UNKNOWN ),
         mVolume( 0 ),
-        mLooping( false )
+        mLooping( false ),
+        mDebugLevel( LLMediaBase::DEBUG_LEVEL_NONE )
 {
 }
 
@@ -92,6 +93,15 @@ bool LLMediaImplCommon::reset()
 
 ////////////////////////////////////////////////////////////////////////////////
 // virtual (derives from LLMediaBase)
+bool LLMediaImplCommon::setDebugLevel( LLMediaBase::EDebugLevel level )
+{
+        mDebugLevel = level;
+
+        return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual (derives from LLMediaBase)
 bool LLMediaImplCommon::setMimeType( const std::string mime_type )
 {
         mMimeType = mime_type;
diff --git a/linden/indra/llmedia/llmediaimplcommon.h b/linden/indra/llmedia/llmediaimplcommon.h
index aa6c4d5..8a726f1 100644
--- a/linden/indra/llmedia/llmediaimplcommon.h
+++ b/linden/indra/llmedia/llmediaimplcommon.h
@@ -54,6 +54,7 @@ class LLMediaImplCommon :
                 // housekeeping
                 virtual bool init();
                 virtual bool reset();
+                virtual bool setDebugLevel( LLMediaBase::EDebugLevel level );
                 virtual bool setMimeType( const std::string url );
                 virtual std::string getMimeType() const;
                 virtual std::string getMediaURL() const;
@@ -156,6 +157,7 @@ class LLMediaImplCommon :
                 LLMediaBase::ECommand mCommand;
                 LLMediaBase::EStatus mStatus;
                 bool mLooping;
+                LLMediaBase::EDebugLevel mDebugLevel;
 };
 
 #endif  // LLMEDIAIMPLCOMMON_H
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 30706f1..7ae6b02 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -30,23 +30,35 @@
  * $/LicenseInfo$
  */
 
-#include "llmediaimplgstreamer.h"
-
 ///#if LL_GSTREAMER_ENABLED
 
+#if LL_WINDOWS
+        // GStreamer 0.10.22 - gstutils.h - conversion from 'guint64' to 'guint8'. 
+        // This was an intentional change to make GStreamer more threadsafe, and
+        // is okay. Delete this bit if GStreamer ever gets more VS-friendly -- McCabe
+        #pragma warning(disable : 4244)
+#endif
+
+#include "linden_common.h"
+#include "llmediaimplgstreamer.h"
+
 extern "C" {
 #include <gst/gst.h>
 #include <gst/gstelement.h>
 }
 
+#if LL_WINDOWS
+        #pragma warning(default : 4244)
+#include <direct.h>
+#include <stdlib.h>
+#endif
+
 #include "llmediamanager.h"
 #include "llmediaimplregister.h"
 
 #include "llmediaimplgstreamervidplug.h"
+#include "llgstplaythread.h"
 
-#include "llmediaimplgstreamer_syms.h"
-
-#include "llerror.h"
 
 // register this impl with media manager factory
 static LLMediaImplRegister sLLMediaImplGStreamerReg( "LLMediaImplGStreamer", new LLMediaImplGStreamerMaker() );
@@ -73,7 +85,8 @@ LLMediaImplGStreamer () :
         mPump ( NULL ),
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
-    mState( GST_STATE_NULL )
+        mState( GST_STATE_NULL ),
+        mPlayThread ( NULL )
 {
         startup( NULL );  // Startup gstreamer if it hasn't been already.
 
@@ -90,7 +103,7 @@ LLMediaImplGStreamer () :
         }
 
         // instantiate a playbin element to do the hard work
-        mPlaybin = llgst_element_factory_make ("playbin", "play");
+        mPlaybin = gst_element_factory_make ("playbin", "play");
         if (!mPlaybin)
         {
                 // todo: cleanup pump
@@ -104,7 +117,7 @@ LLMediaImplGStreamer () :
 
                 // Plays inworld instead of in external player
                 mVideoSink =
-                GST_SLVIDEO(llgst_element_factory_make ("private-slvideo", "slvideo"));
+                GST_SLVIDEO(gst_element_factory_make ("private-slvideo", "slvideo"));
                 if (!mVideoSink)
                 {
                         LL_WARNS("MediaImpl") << "Could not instantiate private-slvideo element." << LL_ENDL;
@@ -148,7 +161,7 @@ LLMediaImplGStreamer::
 std::string LLMediaImplGStreamer::getVersion()
 {
         guint major, minor, micro, nano;
-        llgst_version(&major, &minor, &micro, &nano);
+        gst_version(&major, &minor, &micro, &nano);
         std::string version = llformat("%d.%d.%d.%d",major,minor,micro,nano);
         return version;
 }
@@ -165,50 +178,163 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 // Init the glib type system - we need it.
                 g_type_init();
 
-                // Get symbols!
-#if LL_WINDOWS
-                if (! grab_gst_syms("libgstreamer-0.10.dll", "libgstvideo-0.10.dll", "libgstaudio-0.10.dll") )
-                {
-                    LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL;
-                        return false;
-                }
-#else
-                if (! grab_gst_syms("libgstreamer-0.10.so.0", "libgstvideo-0.10.so.0", "libgstaudio-0.10.so.0") )
-                {
-                        LL_WARNS("MediaImpl") << "Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled." << LL_ENDL;
-                        return false;
-                }
-#endif
-                if (llgst_segtrap_set_enabled)
-                        llgst_segtrap_set_enabled(FALSE);
-                else
-                {
-                    LL_WARNS("MediaImpl") << "gst_segtrap_set_enabled() is not available; Automated crash-reporter may cease to function until next restart." << LL_ENDL;
-                }
+                set_gst_plugin_path();
 
                 // Protect against GStreamer resetting the locale, yuck.
                 static std::string saved_locale;
                 saved_locale = setlocale(LC_ALL, NULL);
-                if (0 == llgst_init_check(NULL, NULL, NULL))
+                if (0 == gst_init_check(NULL, NULL, NULL))
                 {
                     LL_WARNS("MediaImpl") << "GStreamer library failed to initialize and load standard plugins." << LL_ENDL;
                         setlocale(LC_ALL, saved_locale.c_str() );
                         return false;
                 }
                 setlocale(LC_ALL, saved_locale.c_str() );
-                
+
+                // Set up logging facilities
+                gst_debug_remove_log_function( gst_debug_log_default );
+                gst_debug_add_log_function( gstreamer_log, NULL );
+
                 // Init our custom plugins - only really need do this once.
                 gst_slvideo_init_class();
 
+
+                // List the plugins GStreamer can find
+                LL_DEBUGS("MediaImpl") << "Found GStreamer plugins:" << LL_ENDL;
+                GList *list;
+                GstRegistry *registry = gst_registry_get_default();
+                std::string loaded = "";
+                for (list = gst_registry_get_plugin_list(registry);
+                     list != NULL;
+                     list = g_list_next(list))
+                {        
+                        GstPlugin *list_plugin = (GstPlugin *)list->data;
+                        (bool)gst_plugin_is_loaded(list_plugin) ? loaded = "Yes" : loaded = "No";
+                        LL_DEBUGS("MediaImpl") << gst_plugin_get_name(list_plugin) << ", loaded? " << loaded << LL_ENDL;
+                }
+                gst_plugin_list_free(list);
+
+
                 done_init = true;
         }
         return true;
 }
 
 
+void LLMediaImplGStreamer::set_gst_plugin_path()
+{
+        // Only needed for Windows.
+        // Linux sets in wrapper.sh, Mac sets in Info-Imprudence.plist
+#ifdef LL_WINDOWS
+
+        char* imp_cwd;
+
+        // Get the current working directory: 
+        imp_cwd = _getcwd(NULL,0);
+
+        if(imp_cwd == NULL)
+        {
+                LL_DEBUGS("MediaImpl") << "_getcwd failed, not setting GST_PLUGIN_PATH."
+                                         << LL_ENDL;
+        }
+        else
+        {
+                LL_DEBUGS("MediaImpl") << "Imprudence is installed at "
+                                         << imp_cwd << LL_ENDL;
+
+                // Grab the current path, if it's set.
+                std::string old_plugin_path = "";
+                char *old_path = getenv("GST_PLUGIN_PATH");
+                if(old_path == NULL)
+                {
+                        LL_DEBUGS("MediaImpl") << "Did not find user-set GST_PLUGIN_PATH."
+                                                 << LL_ENDL;
+                }
+                else
+                {
+                        old_plugin_path = ";" + std::string( old_path );
+                }
+
+
+                // Search both Imprudence and Imprudence\lib\gstreamer-plugins.
+                // If those fail, search the path the user has set, if any.
+                std::string plugin_path =
+                  "GST_PLUGIN_PATH=" +
+                  std::string(imp_cwd) + "\\lib\\gstreamer-plugins;" +
+                  std::string(imp_cwd) +
+                  old_plugin_path;
+
+                // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe
+                // Returns 0 on success
+                if(_putenv( (char*)plugin_path.c_str() ))
+                {       
+                        LL_WARNS("MediaImpl") << "Setting environment variable failed!" << LL_ENDL;
+                }
+                else
+                {
+                        LL_DEBUGS("MediaImpl") << "GST_PLUGIN_PATH set to "
+                                                                         << getenv("GST_PLUGIN_PATH") << LL_ENDL;
+                }
+        }
+
+#endif //LL_WINDOWS
+}
+
+
+void LLMediaImplGStreamer::gstreamer_log(GstDebugCategory *category,
+                                         GstDebugLevel level,
+                                         const gchar *file,
+                                         const gchar *function,
+                                         gint line,
+                                         GObject *object,
+                                         GstDebugMessage *message,
+                                         gpointer data)
+{
+        std::stringstream log(std::stringstream::out);
+
+        // Log format example:
+        // 
+        // GST_ELEMENT_PADS: removing pad 'sink' (in gstelement.c:757:gst_element_remove_pad)
+        // 
+        log << gst_debug_category_get_name( category ) << ": "
+            << gst_debug_message_get(message) << " "
+            << "(in " << file << ":" << line << ":" << function << ")";
+
+        switch( level )
+        {
+                case GST_LEVEL_ERROR:
+                        LL_ERRS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_WARNING:
+                        LL_WARNS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_DEBUG:
+                        LL_DEBUGS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                case GST_LEVEL_INFO:
+                        LL_INFOS("MediaImpl") << log.str() << LL_ENDL;
+                        break;
+                default:
+                        // Do nothing.
+                        break;
+        }
+}
+
+
 bool LLMediaImplGStreamer::closedown()
 {
-        ungrab_gst_syms();
+        return true;
+}
+
+
+bool LLMediaImplGStreamer::setDebugLevel( LLMediaBase::EDebugLevel level )
+{
+        // Do parent class stuff.
+        LLMediaImplCommon::setDebugLevel(level);
+
+        // Set GStreamer verbosity.
+        gst_debug_set_default_threshold( (GstDebugLevel)level );
+
         return true;
 }
 
@@ -236,7 +362,7 @@ static const char* get_gst_state_name(GstState state)
 gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gpointer data)
 {
 #ifdef LL_GST_REPORT_STATE_CHANGES
-        LL_DEBUGS("MediaCallback") << "Got GST message type: " << LLGST_MESSAGE_TYPE_NAME (message) << LL_ENDL;
+        LL_DEBUGS("MediaCallback") << "Got GST message type: " << GST_MESSAGE_TYPE_NAME (message) << LL_ENDL;
 #endif
 
         LLMediaImplGStreamer *impl = (LLMediaImplGStreamer*)data;
@@ -245,17 +371,13 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
         {
                 case GST_MESSAGE_BUFFERING: 
                 {
-                        // NEEDS GST 0.10.11+
-                        if (llgst_message_parse_buffering)
-                        {
-                                gint percent = 0;
-                                llgst_message_parse_buffering(message, &percent);
+                        gint percent = 0;
+                        gst_message_parse_buffering(message, &percent);
 #ifdef LL_GST_REPORT_STATE_CHANGES
-                                LL_DEBUGS("MediaBuffering") << "GST buffering: " << percent << "%%" << LL_ENDL;
+                        LL_DEBUGS("MediaBuffering") << "GST buffering: " << percent << "%%" << LL_ENDL;
 #endif
-                                LLMediaEvent event( impl, percent );
-                                impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
-                        }
+                        LLMediaEvent event( impl, percent );
+                        impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
                 }
                         break;
                 case GST_MESSAGE_STATE_CHANGED: 
@@ -263,7 +385,7 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         GstState old_state;
                         GstState new_state;
                         GstState pending_state;
-                        llgst_message_parse_state_changed(message,
+                        gst_message_parse_state_changed(message,
                                                 &old_state,
                                                 &new_state,
                                                 &pending_state);
@@ -308,7 +430,7 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         GError *err = NULL;
                         gchar *debug = NULL;
 
-                        llgst_message_parse_error (message, &err, &debug);
+                        gst_message_parse_error (message, &err, &debug);
                         LL_WARNS("MediaImpl") << "GST Error: " << err->message << LL_ENDL;
                         g_error_free (err);
                         g_free (debug);
@@ -320,17 +442,14 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 }
                 case GST_MESSAGE_INFO: 
                 {
-                        if (llgst_message_parse_info)
-                        {
-                                GError *err = NULL;
-                                gchar *debug = NULL;
+                        GError *err = NULL;
+                        gchar *debug = NULL;
                         
-                                llgst_message_parse_info (message, &err, &debug);
-                                LL_INFOS("MediaImpl") << "GST info: " << err->message
-                            << LL_ENDL;
-                                g_error_free (err);
-                                g_free (debug);
-                        }
+                        gst_message_parse_info (message, &err, &debug);
+                        LL_INFOS("MediaImpl") << "GST info: " << err->message
+                                                                                                                << LL_ENDL;
+                        g_error_free (err);
+                        g_free (debug);
                         break;
                 }
                 case GST_MESSAGE_WARNING: 
@@ -338,7 +457,7 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         GError *err = NULL;
                         gchar *debug = NULL;
 
-                        llgst_message_parse_warning (message, &err, &debug);
+                        gst_message_parse_warning (message, &err, &debug);
                         LL_WARNS("MediaImpl") << "GST warning: " <<  err->message
                     << LL_ENDL;
                         g_error_free (err);
@@ -351,10 +470,10 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 GstTagList *tag_list;
                 gchar *title;
                 gchar *artist;
-                llgst_message_parse_tag(message, &tag_list);
-                gboolean hazTitle = llgst_tag_list_get_string(tag_list,
+                gst_message_parse_tag(message, &tag_list);
+                gboolean hazTitle = gst_tag_list_get_string(tag_list,
                         GST_TAG_TITLE, &title);
-                gboolean hazArtist = llgst_tag_list_get_string(tag_list,
+                gboolean hazArtist = gst_tag_list_get_string(tag_list,
                         GST_TAG_ARTIST, &artist);
                 if(hazTitle) 
                         LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
@@ -408,13 +527,13 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
         g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), NULL);
 
         // get playbin's bus - perhaps this can/should be done in ctor
-        GstBus *bus = llgst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
+        GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
         if (!bus)
         {
                 return false;
         }
-        llgst_bus_add_watch (bus, bus_callback, this);
-        llgst_object_unref (bus);
+        gst_bus_add_watch (bus, bus_callback, this);
+        gst_object_unref (bus);
 
         mState = GST_STATE_READY;
 
@@ -431,9 +550,9 @@ bool LLMediaImplGStreamer::unload()
         LL_DEBUGS("MediaImpl") << "unloading media..." << LL_ENDL;
         if (mPlaybin)
         {
-                llgst_element_set_state (mPlaybin, GST_STATE_NULL);
+                gst_element_set_state (mPlaybin, GST_STATE_NULL);
                 mState = GST_STATE_NULL;
-                llgst_object_unref (GST_OBJECT (mPlaybin));
+                gst_object_unref (GST_OBJECT (mPlaybin));
                 mPlaybin = NULL;
         }
 
@@ -591,20 +710,23 @@ bool LLMediaImplGStreamer::stop()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
-        GstElement *pipeline = (GstElement *)llgst_object_ref(GST_OBJECT(mPlaybin));
-        llgst_object_unref(pipeline);
-        
-        llgst_element_set_state(pipeline, GST_STATE_READY);
+        GstStateChangeReturn state_change;
 
-        if (mState == GST_STATE_PLAYING)
-                mState = GST_STATE_VOID_PENDING;
-        else
-                mState = GST_STATE_READY; 
+        state_change = gst_element_set_state(mPlaybin, GST_STATE_READY);
 
-        GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE);
-        LL_DEBUGS("MediaImpl") << "get_state: " << llgst_element_state_change_return_get_name(state_change) << LL_ENDL;
+        LL_DEBUGS("MediaImpl") << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
 
-        return true;
+        if (state_change == GST_STATE_CHANGE_FAILURE)
+        {
+                LL_WARNS("MediaImpl") << "could not stop stream!" << LL_ENDL;
+                return false;
+        }
+        else
+        {
+                // Going into pending after play keeps dead streams from looping
+                (mState == GST_STATE_PLAYING) ? (mState = GST_STATE_VOID_PENDING) : (mState = GST_STATE_READY);
+                return true;
+        }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -616,25 +738,47 @@ bool LLMediaImplGStreamer::play()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
-        GstElement *pipeline = (GstElement *)llgst_object_ref(GST_OBJECT(mPlaybin));
-        llgst_object_unref(pipeline);
+        // Clean up the existing thread, if any.
+        if( mPlayThread != NULL && mPlayThread->isStopped())
+        {
+                delete mPlayThread;
+                mPlayThread = NULL;
+        }
+
+        if( mPlayThread == NULL )
+        {
+                // Make a new thread to start playing. This keeps the viewer
+                // responsive while the stream is resolved and buffered.
+                mPlayThread = new LLGstPlayThread( (LLMediaImplCommon *)this, "GstPlayThread", NULL);
+                mPlayThread->start();
+        }
+
+        return true;
+}
+
+
+void LLMediaImplGStreamer::startPlay()
+{
+        GstElement *pipeline = (GstElement *)gst_object_ref(GST_OBJECT(mPlaybin));
+        gst_object_unref(pipeline);
         
-        llgst_element_set_state(pipeline, GST_STATE_PLAYING);
+        GstStateChangeReturn state_change;
+
+        state_change = gst_element_set_state(mPlaybin, GST_STATE_PLAYING);
         mState = GST_STATE_PLAYING;
-        /*llgst_element_set_state(mPlaybin, GST_STATE_PLAYING);
-        mState = GST_STATE_PLAYING;*/
 
-        GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE);
-        LL_DEBUGS("MediaImpl") << "get_state: " << llgst_element_state_change_return_get_name(state_change) << LL_ENDL;
+        LL_DEBUGS("MediaImpl") << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
 
         // Check to make sure playing was successful. If not, stop.
+        // NOTE: state_change is almost always GST_STATE_CHANGE_ASYNC
         if (state_change == GST_STATE_CHANGE_FAILURE)
         {
-                setStatus(LLMediaBase::STATUS_STOPPED);
+                // If failing from a bad stream, go into an unknown
+                // state to stop bus_callback from looping back. 
+                // We also force a stop in case the operations don't sync
+                setStatus(LLMediaBase::STATUS_UNKNOWN);
                 stop();
         }
-
-        return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -646,13 +790,22 @@ bool LLMediaImplGStreamer::pause()
         if (!mPlaybin || mState == GST_STATE_NULL)
                 return true;
 
-        llgst_element_set_state(mPlaybin, GST_STATE_PAUSED);
-        mState = GST_STATE_PAUSED;
-        
-        GstStateChangeReturn state_change = llgst_element_get_state(mPlaybin, NULL, NULL, GST_CLOCK_TIME_NONE);
-        LL_DEBUGS("MediaImpl") << "get_state: " << llgst_element_state_change_return_get_name(state_change) << LL_ENDL;
+        GstStateChangeReturn state_change;
 
-        return true;
+        state_change = gst_element_set_state(mPlaybin, GST_STATE_PAUSED);
+
+        LL_DEBUGS("MediaImpl") << gst_element_state_change_return_get_name(state_change) << LL_ENDL;
+
+        if (state_change == GST_STATE_CHANGE_FAILURE)
+        {
+                LL_WARNS("MediaImpl") << "could not pause stream!" << LL_ENDL;
+                return false;
+        }
+        else
+        {
+                mState = GST_STATE_PAUSED;
+                return true;
+        }
 };
 
 
@@ -671,7 +824,7 @@ bool LLMediaImplGStreamer::seek(double time)
         bool success = false;
         if (mPlaybin)
         {
-                success = llgst_element_seek(mPlaybin, 1.0F, GST_FORMAT_TIME,
+                success = gst_element_seek(mPlaybin, 1.0F, GST_FORMAT_TIME,
                                 GstSeekFlags(GST_SEEK_FLAG_FLUSH |
                                              GST_SEEK_FLAG_KEY_UNIT),
                                 GST_SEEK_TYPE_SET, gint64(time*1000000000.0F),
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index dec970a..32e6bd1 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -48,6 +48,7 @@ extern "C" {
 }
 
 #include "llmediaimplgstreamervidplug.h"
+#include "llgstplaythread.h"
 
 class LLMediaManagerData;
 class LLMediaImplMaker;
@@ -66,6 +67,26 @@ class LLMediaImplGStreamer:
                 static bool startup( LLMediaManagerData* init_data );
                 static bool closedown();
 
+                // Sets GST_PLUGIN_PATH env var for GStreamer.
+                static void set_gst_plugin_path();
+
+                /* virtual */ bool setDebugLevel( LLMediaBase::EDebugLevel level );
+
+                // Function given to GStreamer for handling debug messages
+                static void gstreamer_log(GstDebugCategory *category,
+                                          GstDebugLevel level,
+                                          const gchar *file,
+                                          const gchar *function,
+                                          gint line,
+                                          GObject *object,
+                                          GstDebugMessage *message,
+                                          gpointer data)
+#if __GNUC__
+                                          // recommended by the gstreamer docs
+                                          G_GNUC_NO_INSTRUMENT
+#endif
+                                          ;
+
                 /* virtual */ std::string getVersion();
                 /* virtual */ bool navigateTo( const std::string url );
                 /* virtual */ bool updateMedia();
@@ -76,9 +97,13 @@ class LLMediaImplGStreamer:
                 /* virtual */ bool seek( double time );
             /* virtual */ bool setVolume( float volume );
 
+                void startPlay();
+
+
                 LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
         private:
+
                 // misc
                 bool unload();
                 bool pause();
@@ -100,6 +125,8 @@ class LLMediaImplGStreamer:
                 GstSLVideo *mVideoSink;
                 GstState mState;
                 GstState getState() const { return mState; }
+
+                LLGstPlayThread *mPlayThread;
 };
 
 class LLMediaImplGStreamerMaker : public LLMediaImplMaker
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp b/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
deleted file mode 100644
index fb1949a..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/** 
- * @file llmediaimplgstreamer_syms.cpp
- * @brief dynamic GStreamer symbol-grabbing code
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-///#if LL_GSTREAMER_ENABLED
-
-extern "C" {
-#include <gst/gst.h>
-
-#include "apr_pools.h"
-#include "apr_dso.h"
-}
-
-#include "llmediaimplgstreamer.h"
-
-#define LL_GST_SYM(REQ, GSTSYM, RTN, ...) RTN (*ll##GSTSYM)(__VA_ARGS__) = NULL
-#include "llmediaimplgstreamer_syms_raw.inc"
-#include "llmediaimplgstreamer_syms_rawa.inc"
-#include "llmediaimplgstreamer_syms_rawv.inc"
-#undef LL_GST_SYM
-
-
-static bool sSymsGrabbed = false;
-static apr_pool_t *sSymGSTDSOMemoryPool = NULL;
-static apr_dso_handle_t *sSymGSTDSOHandleG = NULL;
-static apr_dso_handle_t *sSymGSTDSOHandleV = NULL;
-static apr_dso_handle_t *sSymGSTDSOHandleA = NULL;
-
-
-bool grab_gst_syms(std::string gst_dso_name,
-                   std::string gst_dso_name_vid,
-                   std::string gst_dso_name_aud)
-{
-        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_aud.c_str(),
-                                                       sSymGSTDSOMemoryPool) ))
-                {
-                        INFOMSG("Found DSO: %s", gst_dso_name_aud.c_str());
-#include "llmediaimplgstreamer_syms_rawa.inc"
-                        
-                        if ( sSymGSTDSOHandle )
-                        {
-                                sSymGSTDSOHandleA = 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"
-                        }
-                        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_aud.c_str());
-                        rtn = false; // failure
-                }
-                
-                rtn = !sym_error;
-        }
-        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 ( sSymGSTDSOHandleA )
-        {
-                apr_dso_unload(sSymGSTDSOHandleA);
-                sSymGSTDSOHandleA = 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_rawa.inc"
-#include "llmediaimplgstreamer_syms_rawv.inc"
-#undef LL_GST_SYM
-
-        sSymsGrabbed = false;
-}
-
-
-///#endif // LL_GSTREAMER_ENABLED
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms.h b/linden/indra/llmedia/llmediaimplgstreamer_syms.h
deleted file mode 100644
index ebebd80..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/** 
- * @file llmediaimplgstreamer_syms.h
- * @brief dynamic GStreamer symbol-grabbing code
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-///#if LL_GSTREAMER_ENABLED
-
-extern "C" {
-#include <gst/gst.h>
-}
-
-bool grab_gst_syms(std::string gst_dso_name,
-                   std::string gst_dso_name_vid,
-                   std::string gst_dso_name_aud);
-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_rawa.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_AUDIO_SINK
-#define GST_TYPE_AUDIO_SINK (llgst_audio_sink_get_type())
-#undef GST_TYPE_VIDEO_SINK
-#define GST_TYPE_VIDEO_SINK (llgst_video_sink_get_type())
-#undef _gst_debug_register_funcptr
-#define _gst_debug_register_funcptr ll_gst_debug_register_funcptr
-#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_GSTREAMER_ENABLED
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
deleted file mode 100644
index 0d0d764..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// required symbols to grab
-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_element_get_state, GstStateChangeReturn, GstElement *element, GstState *state, GstState *pending, GstClockTime timeout);
-LL_GST_SYM(true, gst_object_unref, void, gpointer object);
-LL_GST_SYM(true, gst_object_ref, gpointer, 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_debug_register_funcptr, void, GstDebugFuncPtr func, gchar* ptrname);
-LL_GST_SYM(true, _gst_debug_category_new, GstDebugCategory *, gchar *name, guint color, gchar *description);
-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);
-LL_GST_SYM(true, gst_version, void, guint *major, guint *minor, guint *micro, guint *nano);
-LL_GST_SYM(true, gst_element_state_change_return_get_name, const gchar *, GstStateChangeReturn state_ret);
-
-// optional symbols to grab
-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);
-
-//aw tag infos (Artist, Title, ...tbc...)
-LL_GST_SYM(true, gst_message_parse_tag, void, GstMessage *message, GstTagList **tag_list);
-LL_GST_SYM(true, gst_tag_list_get_string, gboolean, const GstTagList *list, const gchar *tag, gchar **value);
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc
deleted file mode 100644
index 0be99b5..0000000
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawa.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-// required symbols to grab
-LL_GST_SYM(true, gst_audio_sink_get_type, GType, void);
-
-// optional symbols to grab
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_rawv.inc
deleted file mode 100644
index 14fbcb4..0000000
--- a/linden/indra/llmedia/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/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
index c95ef36..eaf2c84 100644
--- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
@@ -37,8 +37,6 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideosink.h>
 
-#include "llmediaimplgstreamer_syms.h"
-
 #include "llthread.h"
 
 #include "llmediaimplgstreamervidplug.h"
@@ -88,9 +86,9 @@ gst_slvideo_base_init (gpointer gclass)
         };
         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);
+        gst_element_class_add_pad_template (element_class,
+                              gst_static_pad_template_get (&sink_factory));
+        gst_element_class_set_details (element_class, &element_details);
 }
 
 
@@ -101,7 +99,7 @@ gst_slvideo_finalize (GObject * object)
         slvideo = GST_SLVIDEO (object);
         if (slvideo->caps)
         {
-                llgst_caps_unref(slvideo->caps);
+                gst_caps_unref(slvideo->caps);
         }
 
         G_OBJECT_CLASS(parent_class)->finalize (object);
@@ -112,7 +110,7 @@ static GstFlowReturn
 gst_slvideo_show_frame (GstBaseSink * bsink, GstBuffer * buf)
 {
         GstSLVideo *slvideo;
-        llg_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
+        g_return_val_if_fail (buf != NULL, GST_FLOW_ERROR);
         
         slvideo = GST_SLVIDEO(bsink);
         
@@ -205,7 +203,7 @@ gst_slvideo_get_caps (GstBaseSink * bsink)
         GstSLVideo *slvideo;
         slvideo = GST_SLVIDEO(bsink);
         
-        return llgst_caps_ref (slvideo->caps);
+        return gst_caps_ref (slvideo->caps);
 }
 
 
@@ -221,36 +219,36 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
         
         filter = GST_SLVIDEO(bsink);
         
-        intersection = llgst_caps_intersect (filter->caps, caps);
-        if (llgst_caps_is_empty (intersection))
+        intersection = gst_caps_intersect (filter->caps, caps);
+        if (gst_caps_is_empty (intersection))
         {
                 // no overlap between our caps and requested caps
                 return FALSE;
         }
-        llgst_caps_unref(intersection);
+        gst_caps_unref(intersection);
         
         int width = 0;
         int height = 0;
         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");
+        structure = gst_caps_get_structure (caps, 0);
+        ret = gst_structure_get_int (structure, "width", &width);
+        ret = ret && gst_structure_get_int (structure, "height", &height);
+        fps = gst_structure_get_value (structure, "framerate");
         ret = ret && (fps != NULL);
-        par = llgst_structure_get_value (structure, "pixel-aspect-ratio");
+        par = gst_structure_get_value (structure, "pixel-aspect-ratio");
         if (!ret)
                 return FALSE;
 
         filter->width = width;
         filter->height = height;
-        filter->fps_n = llgst_value_get_fraction_numerator(fps);
-        filter->fps_d = llgst_value_get_fraction_denominator(fps);
+        filter->fps_n = gst_value_get_fraction_numerator(fps);
+        filter->fps_d = gst_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);
+                filter->par_n = gst_value_get_fraction_numerator(par);
+                filter->par_d = gst_value_get_fraction_denominator(par);
         }
         else
         {
@@ -261,15 +259,15 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
         GST_VIDEO_SINK_HEIGHT(filter) = height;
         
         filter->format = SLV_PF_UNKNOWN;
-        if (0 == strcmp(llgst_structure_get_name(structure),
+        if (0 == strcmp(gst_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);
+                gst_structure_get_int(structure, "red_mask", &red_mask);
+                gst_structure_get_int(structure, "green_mask", &green_mask);
+                gst_structure_get_int(structure, "blue_mask", &blue_mask);
                 if ((unsigned int)red_mask   == 0xFF000000 &&
                     (unsigned int)green_mask == 0x00FF0000 &&
                     (unsigned int)blue_mask  == 0x0000FF00)
@@ -366,9 +364,9 @@ gst_slvideo_update_caps (GstSLVideo * slvideo)
         // GStreamer will automatically convert colourspace if necessary.
         // GStreamer will automatically resize media to one of these enumerated
         // powers-of-two that we ask for (yay GStreamer!)
-        caps = llgst_caps_from_string (SLV_ALLCAPS);
+        caps = gst_caps_from_string (SLV_ALLCAPS);
         
-        llgst_caps_replace (&slvideo->caps, caps);
+        gst_caps_replace (&slvideo->caps, caps);
 }
 
 
@@ -401,7 +399,7 @@ static void
 gst_slvideo_set_property (GObject * object, guint prop_id,
                           const GValue * value, GParamSpec * pspec)
 {
-        llg_return_if_fail (GST_IS_SLVIDEO (object));
+        g_return_if_fail (GST_IS_SLVIDEO (object));
         
         if (prop_id) {
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -412,7 +410,7 @@ static void
 gst_slvideo_get_property (GObject * object, guint prop_id,
                           GValue * value, GParamSpec * pspec)
 {
-        llg_return_if_fail (GST_IS_SLVIDEO (object));
+        g_return_if_fail (GST_IS_SLVIDEO (object));
 
         if (prop_id) {
                 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -433,30 +431,23 @@ plugin_init (GstPlugin * plugin)
         GST_DEBUG_CATEGORY_INIT (gst_slvideo_debug, "private-slvideo-plugin",
                                  0, "Second Life Video Sink");
 
-        return llgst_element_register (plugin, "private-slvideo",
+        return gst_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 "packagehack"
-        GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-                                  GST_VERSION_MINOR,
-                                  "private-slvideoplugin", 
-                                  "SL Video sink plugin",
-                                  plugin_init, "0.1", GST_LICENSE_UNKNOWN,
-                                  "Second Life",
-                                  "http://www.secondlife.com/");
-#undef PACKAGE
 
 void gst_slvideo_init_class (void)
 {
-        ll_gst_plugin_register_static (&gst_plugin_desc);
-        //fprintf(stderr, "\n\n\nCLASS INIT\n\n\n");
+        gst_plugin_register_static( GST_VERSION_MAJOR,
+                                    GST_VERSION_MINOR,
+                                    "private-slvideoplugin", 
+                                    "SL Video sink plugin",
+                                    plugin_init,
+                                    "0.1",
+                                    GST_LICENSE_UNKNOWN,
+                                    "Second Life",
+                                    "Second Life",
+                                    "http://www.secondlife.com/" );
 }
 
 ///#endif // LL_GSTREAMER_ENABLED
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index 5394b62..7fe0df3 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -30,12 +30,24 @@
  */
 
 #include "llmediamanager.h"
+
+#if LL_WINDOWS
+        // GStreamer 0.10.22 - gstutils.h - conversion from 'guint64' to 'guint8'. 
+        // This was an intentional change to make GStreamer more threadsafe, and
+        // is okay. Delete this bit if GStreamer ever gets more VS-friendly -- McCabe
+        #pragma warning(disable : 4244)
+#endif
+#include "llmediaimplgstreamer.h"
+#if LL_WINDOWS
+        #pragma warning(default : 4244)
+#endif
+
 #include "llmediaimplfactory.h"
 
 #include "llmediaimplexample1.h"
 #include "llmediaimplexample2.h"
 #include "llmediaimplquicktime.h"
-#include "llmediaimplgstreamer.h"
+
 #if LL_LLMOZLIB_ENABLED
 # include "llmediaimplllmozlib.h"
 #endif
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index a07f379..8a4b063 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -160,10 +160,9 @@ namespace
                                 fstream.seekg(0, std::ios::end);
                                 U32 fileSize = fstream.tellg();
                                 fstream.seekg(0, std::ios::beg);
-                                char* fileBuffer;
-                                fileBuffer = new char [fileSize];
-                                fstream.read(fileBuffer, fileSize);
-                                ostream.write(fileBuffer, fileSize);
+                                std::vector<char> fileBuffer(fileSize);
+                                fstream.read(&fileBuffer[0], fileSize);
+                                ostream.write(&fileBuffer[0], fileSize);
                                 fstream.close();
                                 eos = true;
                                 return STATUS_DONE;
@@ -190,10 +189,9 @@ namespace
                         
                         LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
                         S32 fileSize = vfile.getSize();
-                        U8* fileBuffer;
-                        fileBuffer = new U8 [fileSize];
-            vfile.read(fileBuffer, fileSize);
-            ostream.write((char*)fileBuffer, fileSize);
+                        std::vector<U8> fileBuffer(fileSize);
+                        vfile.read(&fileBuffer[0], fileSize);
+                        ostream.write((char*)&fileBuffer[0], fileSize);
                         eos = true;
                         return STATUS_DONE;
                 }
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 9f8cd65..2f4e873 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1580,6 +1580,7 @@ void LLFloater::updateButtons()
         S32 button_count = 0;
         for (S32 i = 0; i < BUTTON_COUNT; i++)
         {
+                if(!mButtons[i]) continue;
                 mButtons[i]->setEnabled(mButtonsEnabled[i]);
 
                 if (mButtonsEnabled[i] 
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 2a911ba..56acf4c 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -455,6 +455,7 @@ PARCEL_FLAG_ALLOW_LANDMARK			Used with llGetParcelFlags to find if a parcel allo
 PARCEL_FLAG_ALLOW_TERRAFORM                     Used with llGetParcelFlags to find if a parcel allows anyone to terraform the land
 PARCEL_FLAG_ALLOW_DAMAGE                        Used with llGetParcelFlags to find if a parcel allows damage
 PARCEL_FLAG_ALLOW_CREATE_OBJECTS        Used with llGetParcelFlags to find if a parcel allows anyone to create objects
+PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS  Used with llGetParcelFlags to find if a parcel allows group members or objects to create objects
 PARCEL_FLAG_USE_ACCESS_GROUP            Used with llGetParcelFlags to find if a parcel limits access to a group
 PARCEL_FLAG_USE_ACCESS_LIST                     Used with llGetParcelFlags to find if a parcel limits access to a list of residents
 PARCEL_FLAG_USE_BAN_LIST                        Used with llGetParcelFlags to find if a parcel uses a ban list
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 0f15236..55ff208 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4659,6 +4659,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>MediaDebugLevel</key>
+    <map>
+      <key>Comment</key>
+      <string>How spammy media (GStreamer) debug output should be. (0-4)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>MemoryLogFrequency</key>
         <map>
         <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 15ce1a3..b2bfccf 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -75,9 +75,6 @@
 
 #if LL_WINDOWS
         #include "llwindebug.h"
-        #include <direct.h>
-        #include <errno.h>
-        #include <stdlib.h>
 #endif
 
 #if LL_WINDOWS
@@ -320,30 +317,6 @@ std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
 
-void LLAppViewer::gst_plugin_path()
-{
-#ifdef LL_WINDOWS
-        char* buffer;
-
-        // Get the current working directory: 
-        if((buffer = _getcwd(NULL,0)) == NULL)
-        {
-                LL_INFOS("InitInfo") << "_getcwd error" << LL_ENDL;
-        }
-        else
-        {
-                LL_INFOS("InitInfo") << "Imprudence is installed at " << buffer << LL_ENDL;
-                
-                std::string plugin_path = "GST_PLUGIN_PATH=" + std::string(buffer) + "\\lib\\gstreamer-plugins";
-
-                // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe
-                const char* gst_plugin_path = plugin_path.c_str();
-                putenv(gst_plugin_path);
-                LL_INFOS("InitInfo") << "GST_PLUGIN_PATH set to " << getenv("GST_PLUGIN_PATH") << LL_ENDL;
-        }
-#endif //LL_WINDOWS
-}
-
 void idle_afk_check()
 {
         // check idle timers
@@ -643,8 +616,6 @@ bool LLAppViewer::init()
         LL_VERSION_PATCH, 
         LL_VERSION_BUILD );
 
-        gst_plugin_path();
-
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 2083a93..58dc835 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -138,8 +138,6 @@ public:
 
 protected:
 
-        void gst_plugin_path(); // Sets GST_PLUGIN_PATH environment variable for GStreamer.
-
         virtual bool initWindow(); // Initialize the viewer's window.
         virtual bool initLogging(); // Initialize log files, logging system, return false on failure.
         virtual void initConsole() {}; // Initialize OS level debugging console.
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index fc2742f..b4f1a22 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -59,6 +59,7 @@
 #include "llfloaterchat.h"
 #include "llviewerstats.h"
 #include "lluictrlfactory.h"
+#include "llselectmgr.h"
 
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -194,7 +195,20 @@ BOOL LLFloaterScriptQueue::start()
 {
         //llinfos << "LLFloaterCompileQueue::start()" << llendl;
         std::string buffer;
-        buffer = llformat("Starting %s of %d items.", mStartString.c_str(), mObjectIDs.count()); // *TODO: Translate
+
+        LLSelectMgr *mgr = LLSelectMgr::getInstance();
+        LLObjectSelectionHandle selectHandle = mgr->getSelection();
+        U32 n_objects = 0;
+        if (gSavedSettings.getBOOL("EditLinkedParts"))
+        {
+                n_objects = selectHandle->getObjectCount();
+        }
+        else
+        {
+                n_objects = selectHandle->getRootObjectCount();
+        }
+
+        buffer = llformat("Starting %s of %d items.", mStartString.c_str(), n_objects); // *TODO: Translate
         
         LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
         list->addCommentText(buffer);
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 5e4aafc..e058681 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -497,7 +497,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
         F32 dist_squared = 0.f;
         F32 camdist2 = (mDistanceWRTCamera * mDistanceWRTCamera);
 
-        if (damped && mDistanceWRTCamera > 0.0f)
+        if (damped && isVisible())
         {
                 F32 lerp_amt = llclamp(LLCriticalDamp::getInterpolant(OBJECT_DAMPING_TIME_CONSTANT), 0.f, 1.f);
                 LLVector3 new_pos = lerp(old_pos, target_pos, lerp_amt);
@@ -521,11 +521,19 @@ F32 LLDrawable::updateXform(BOOL undamped)
                 {
                         // snap to final position
                         dist_squared = 0.0f;
+                        if (!isRoot())
+                        { //child prim snapping to some position, needs a rebuild
+                                gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+                        }
                 }
         }
 
         if ((mCurrentScale != target_scale) ||
-                (!isRoot() && (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || !mVObjp->getAngularVelocity().isExactlyZero()))
+                (!isRoot() && 
+                 (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || 
+                 !mVObjp->getAngularVelocity().isExactlyZero() ||
+                 target_pos != mXform.getPosition() ||
+                 target_rot != mXform.getRotation()))
         { //child prim moving or scale change requires immediate rebuild
                 gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
         }
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index bbcfba6..1edfbe6 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -899,12 +899,41 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
 // static
 void LLFilePicker::add_to_selectedfiles(gpointer data, gpointer user_data)
 {
-        LLFilePicker* picker = (LLFilePicker*) user_data;
+        // We need to run g_filename_to_utf8 in the user's locale
+        std::string old_locale(setlocale(LC_ALL, NULL));
+        setlocale(LC_ALL, "");
+
+        LLFilePicker* picker = (LLFilePicker*) user_data;
+        GError *error = NULL;
         gchar* filename_utf8 = g_filename_to_utf8((gchar*)data,
-                                                  -1, NULL, NULL, NULL);
-        picker->mFiles.push_back(std::string(filename_utf8));
-        lldebugs << "ADDED FILE " << filename_utf8 << llendl;
-        g_free(filename_utf8);
+                                                  -1, NULL, NULL, &error);
+        if (error)
+        {
+                // This condition should really be notified to the user, e.g.,
+                // through a message box.  Just logging it is inapropriate.
+                // FIXME.
+                
+                // Ghhhh.  g_filename_display_name is new to glib 2.6, and it
+                // is too new for SL! (Note that the latest glib as of this
+                // writing is 2.22. *sigh*) LL supplied *makeASCII family are
+                // also unsuitable since they allow control characters...
+
+                std::string display_name;
+                for (const gchar *str = (const gchar *)data; *str; str++)
+                {
+                        display_name += (char)((*str >= 0x20 && *str <= 0x7E) ? *str : '?');
+                }
+                llwarns << "g_filename_to_utf8 failed on \"" << display_name << "\": " << error->message << llendl;
+        }
+
+        if (filename_utf8)
+        {
+                picker->mFiles.push_back(std::string(filename_utf8));
+                lldebugs << "ADDED FILE " << filename_utf8 << llendl;
+                g_free(filename_utf8);
+        }
+
+        setlocale(LC_ALL, old_locale.c_str());
 }
 
 // static
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a626ad3..14f9a10 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -385,7 +385,11 @@ void LLFloaterChat::addChat(const LLChat& chat,
                         text_color = gSavedSettings.getColor("IMChatColor");
                         size = INSTANT_MSG_SIZE;
                 }
-                gConsole->addLine(chat.mText, size, text_color);
+                // We display anything if it's not an IM. If it's an IM, check pref... 
+                if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatHistory") )
+                {
+                        gConsole->addLine(chat.mText, size, text_color);
+                }
         }
 
         if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM"))
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 7a30b22..a8a3b16 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -70,6 +70,7 @@
 #include "llvosurfacepatch.h"
 #include "llvowlsky.h"
 #include "llrender.h"
+#include "llmediamanager.h"
 
 #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
 BOOL                            gHackGodmode = FALSE;
@@ -429,6 +430,22 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
         return true;
 }
 
+bool handleMediaDebugLevelChanged(const LLSD& newvalue)
+{
+        LLMediaManager *mgr = LLMediaManager::getInstance();
+        if (mgr)
+        {
+                LLMediaBase *impl = 
+                  mgr->createSourceFromMimeType("http", "audio/mpeg");
+
+                if (impl)
+                {
+                        impl->setDebugLevel( (LLMediaBase::EDebugLevel)newvalue.asInteger() );
+                }
+        }
+        return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
 void settings_setup_listeners()
@@ -556,6 +573,7 @@ void settings_setup_listeners()
         gSavedSettings.getControl("VoiceInputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
+        gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
 }
 
 template <> eControlType get_control_type<U32>(const U32& in, LLSD& out) 
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index e99c838..d8fcdcb 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -496,6 +496,13 @@ void LLViewerMedia::initClass()
                 const LLMIMETypes::LLMIMEInfo& info = it->second;
                 mm->addMimeTypeImplNameMap( mime_type, info.mImpl );
         }
+
+        LLMediaBase *impl = mm->createSourceFromMimeType("http", "audio/mpeg");
+        if (impl)
+        {
+                U32 level = gSavedSettings.getU32("MediaDebugLevel");
+                impl->setDebugLevel( (LLMediaBase::EDebugLevel)level );
+        }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 31fdcc3..486e4f1 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5963,8 +5963,9 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
 {
         // Apply until an object fails
         QueueObjects func(q);
-        const bool firstonly = true;
-        bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
+        LLSelectMgr *mgr = LLSelectMgr::getInstance();
+        LLObjectSelectionHandle selectHandle = mgr->getSelection();
+        bool fail = selectHandle->applyToObjects(&func);
         if(fail)
         {
                 if ( !func.scripted )
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index b947f95..221de59 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3286,6 +3286,10 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         msg->getVector3Fast(_PREHASH_SoundData, _PREHASH_Position, pos_local);
         msg->getF32Fast(_PREHASH_SoundData, _PREHASH_Gain, gain);
 
+        //If we have sounds muted, don't even try to load or trigger the sound.
+        if(gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+                return;
+
         // adjust sound location to true global coords
         LLVector3d      pos_global = from_region_handle(region_handle);
         pos_global.mdV[VX] += pos_local.mV[VX];
@@ -3317,7 +3321,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 
 void process_preload_sound(LLMessageSystem *msg, void **user_data)
 {
-        if (!gAudiop)
+        if (!gAudiop || gSavedSettings.getBOOL("MuteSounds"))
         {
                 return;
         }
@@ -3363,6 +3367,9 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
         msg->getF32Fast(_PREHASH_DataBlock, _PREHASH_Gain, gain);
         msg->getU8Fast(_PREHASH_DataBlock, _PREHASH_Flags, flags);
 
+        if(gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+                return;
+
         LLViewerObject *objectp = gObjectList.findObject(object_id);
         if (!objectp)
         {
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index fd2487b..7d70dd2 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3096,69 +3096,62 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 (is_away != mNameAway || is_busy != mNameBusy || is_muted != mNameMute)
                                 || is_appearance != mNameAppearance)
                         {
-                                char line[MAX_STRING];          /* Flawfinder: ignore */
-                                if (!sRenderGroupTitles)
-                                {
-                                        // If all group titles are turned off, stack first name
-                                        // on a line above last name
-                                        strncpy(line, firstname->getString(), MAX_STRING -1 );          /* Flawfinder: ignore */
-                                        line[MAX_STRING -1] = '\0';
-                                        strcat(line, "\n");
-                                }
-                                else if (title && title->getString() && title->getString()[0] != '\0')
+                                std::string line;
+                                if (title && title->getString() && title->getString()[0] != '\0')
                                 {
-                                        strncpy(line, title->getString(), MAX_STRING -1 );              /* Flawfinder: ignore */
-                                        line[MAX_STRING -1] = '\0';
-                                        strcat(line, "\n");             /* Flawfinder: ignore */
-                                        strncat(line, firstname->getString(), MAX_STRING - strlen(line) -1 );           /* Flawfinder: ignore */
+                                        line += title->getString();
+                                        LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR);
+                                        line += "\n";
+                                        line += firstname->getString();
                                 }
                                 else
                                 {
-                                        strncpy(line, firstname->getString(), MAX_STRING -1 );          /* Flawfinder: ignore */
-                                        line[MAX_STRING -1] = '\0';
+                                        line += firstname->getString();
                                 }
 
-                                strcat(line, " ");              /* Flawfinder: ignore */
-                                strncat(line, lastname->getString(), MAX_STRING - strlen(line) -1);             /* Flawfinder: ignore */
+                                line += " ";
+                                line += lastname->getString();
                                 BOOL need_comma = FALSE;
 
                                 if (is_away || is_muted || is_busy)
                                 {
-                                        strcat(line, " (");             /* Flawfinder: ignore */
+                                        line += " (";
                                         if (is_away)
                                         {
-                                                strcat(line, "Away");           /* Flawfinder: ignore */
+                                                line += "Away";
                                                 need_comma = TRUE;
                                         }
                                         if (is_busy)
                                         {
                                                 if (need_comma)
                                                 {
-                                                        strcat(line, ", ");             /* Flawfinder: ignore */
+                                                        line += ", ";
                                                 }
-                                                strcat(line, "Busy");           /* Flawfinder: ignore */
+                                                line += "Busy";
                                                 need_comma = TRUE;
                                         }
                                         if (is_muted)
                                         {
                                                 if (need_comma)
                                                 {
-                                                        strcat(line, ", ");             /* Flawfinder: ignore */
+                                                        line += ", ";
                                                 }
-                                                strcat(line, "Muted");          /* Flawfinder: ignore */
+                                                line += "Muted";
                                                 need_comma = TRUE;
                                         }
-                                        strcat(line,")");               /* Flawfinder: ignore */
+                                        line += ")";
                                 }
                                 if (is_appearance)
                                 {
-                                        strcat(line, "\n(Editing Appearance)");         /* Flawfinder: ignore */
+                                        line += "\n";
+                                        line += "(Editing Appearance)";
                                 }
                                 mNameAway = is_away;
                                 mNameBusy = is_busy;
                                 mNameMute = is_muted;
                                 mNameAppearance = is_appearance;
                                 mTitle = title ? title->getString() : "";
+                                LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR);
                                 mNameString = utf8str_to_wstring(line);
                                 new_name = TRUE;
                         }
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 3523635..e7db166 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2665,6 +2665,18 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render
         LLGLState::checkClientArrays();
         U32 last_type = 0;
         
+        // If we don't do this, we crash something on changing graphics settings
+        // from Medium -> Low, because we unload all the shaders and the 
+        // draw pools aren't aware.  I don't know if this has to be a separate
+        // loop before actual rendering. JC
+        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
+        {
+                LLDrawPool *poolp = *iter;
+                if (poolp->isFacePool() && hasRenderType(poolp->getType()))
+                {
+                        poolp->prerender();
+                }
+        }
         for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
         {
                 LLDrawPool *poolp = *iter;
diff --git a/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
index eb47fa2..d15d186 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="Streaming-Musik abspielen/unterbrechen" />
         <button name="music_play" tool_tip="Streaming-Musik spielen/unterbrechen" />
-        <button name="music_pause" tool_tip="Streaming-Musik unterbrechen" />
         <button name="music_stop" tool_tip="Streaming-Musik beenden" />
         <icon name="media_icon" tool_tip="Streaming-Musik abspielen/unterbrechen" />
         <button name="media_play" tool_tip="Streaming-Musik abspielen/unterbrechen" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index d3174af..8020e9a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -28,7 +28,7 @@
              width="350" />
         <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Include IM in Local Chat" left="148" mouse_opaque="true"
+             label="Show IMs with Chat" left="148" mouse_opaque="true"
              name="include_im_in_chat_history" radio_style="false" width="237" />
         <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
index ff498ba..7b601b4 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="Jouer/pauser le flux musical" />
         <button name="music_play" tool_tip="Jouer/pauser le flux musical" />
-        <button name="music_pause" tool_tip="Pauser le flux musical" />
         <button name="music_stop" tool_tip="Arrêter le flux musical" />
         <icon name="media_icon" tool_tip="Jouer/pauser le flux musical" />
         <button name="media_play" tool_tip="Jouer/pauser le flux musical" />
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
index 7c87dc3..89791a5 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
@@ -4,8 +4,6 @@
              tool_tip="ストリーミング・ミュージックの再生/一時停止" />
         <button name="music_play"
              tool_tip="ストリーミング・ミュージックの再生/一時停止" />
-        <button name="music_pause"
-             tool_tip="ストリーミング・ミュージックの一時停止" />
         <button name="music_stop"
              tool_tip="ストリーミング・ミュージックの停止" />
         <icon name="media_icon"
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
index 3b3aa0e..fa5a010 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="스트리밍 음악 재생/일시 정지" />
         <button name="music_play" tool_tip="스트리밍 음악 재생/일시 정지" />
-        <button name="music_pause" tool_tip="스트리밍 음악 일시 정지" />
         <button name="music_stop" tool_tip="스트리밍 음악 중지" />
         <icon name="media_icon" tool_tip="스트리밍 음악 재생/일시 정지" />
         <button name="media_play" tool_tip="스트리밍 음악 재생/일시 정지" />
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
index d62fe09..466db79 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
@@ -4,7 +4,7 @@
      name="media_controls" width="220">
         <icon bottom="-18" enabled="true" follows="left|top" height="14"
              image_name="icn_label_music.tga" label="" left_delta="6" mouse_opaque="true"
-             name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
+             name="music_icon" scale_image="true" tool_tip="Play streaming music"
              width="14" />
         <button bottom="-21" enabled="true" follows="left|top" height="20"
           image_overlay="icn_play.tga"
@@ -13,15 +13,7 @@
              image_disabled="flyout_btn_left_disabled.tga"
               label="" left_delta="16"
              mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
-             tool_tip="Play/pause streaming music" width="20" />
-  <button bottom="-21" enabled="false" follows="left|top" height="20"
-             image_overlay="icn_pause.tga"
-             image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-             label="" left_delta="0"
-             mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
-             tool_tip="Pause streaming music" width="20" />
+             tool_tip="Play streaming music" width="20" />
   <button bottom="-21" enabled="true" follows="left|top" height="20"
              image_overlay="icn_stop.tga"
              image_unselected="flyout_btn_right.tga"
@@ -33,7 +25,7 @@
   <icon bottom="-18" enabled="true" follows="left|top" height="14"
              image_name="icn_label_media.tga"
              label="" left_delta="22" mouse_opaque="true"
-             name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
+             name="media_icon" scale_image="true" tool_tip="Play/pause streaming media"
              width="17" />
   <button bottom="-21" enabled="true" follows="left|top" height="20"
              image_overlay="icn_play.tga"