24 files changed, 253 insertions, 123 deletions

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index e80f0c3..458b016 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -9,14 +9,14 @@ include(CMakeCopyIfDifferent)
 set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
 set(gst_plugin_release_files
     libdshowsrcwrapper.dll
-    libfsselector.dll
-    libfsvalve.dll
+    libgsta52.dll
     libgstacmenc.dll
     libgstadder.dll
     libgstalaw.dll
     libgstalpha.dll
     libgstalphacolor.dll
     libgstapp.dll
+    libgstasfdemux.dll
     libgstaudiochunk.dll
     libgstaudioconvert.dll
     libgstaudiofx.dll
@@ -27,41 +27,44 @@ set(gst_plugin_release_files
     libgstavi.dll
     libgstcoreelements.dll
     libgstcutter.dll
-    libgstdecodebin2.dll
     libgstdecodebin.dll
+    libgstdecodebin2.dll
     libgstdirectdraw.dll
     libgstdirectsound.dll
     libgstdshowdecwrapper.dll
     libgstdshowsrcwrapper.dll
     libgstdshowvideosink.dll
-    libgstdtmf.dll
+    libgstfaad.dll
     libgstffmpeg.dll
     libgstffmpegcolorspace.dll
     libgstflv.dll
+    libgstgamma.dll
     libgstgdp.dll
     libgsth264parse.dll
     libgsticydemux.dll
     libgstid3demux.dll
     libgstjpeg.dll
     libgstlevel.dll
-    libgstmad.dll
     libgstmms.dll
     libgstmpeg2dec.dll
+    libgstmpeg4videoparse.dll
     libgstmpegaudioparse.dll
     libgstmpegstream.dll
     libgstmpegvideoparse.dll
-    libgstmscodecs.dll
     libgstmulaw.dll
     libgstmultipart.dll
     libgstneon.dll
     libgstogg.dll
+    libgstpcapparse.dll
     libgstplaybin.dll
     libgstpng.dll
     libgstqtdemux.dll
     libgstqueue2.dll
+    libgstreal.dll
+    libgstrealmedia.dll
     libgstrtp.dll
     libgstrtpmanager.dll
-    libgstrtpmuxer.dll 
+    libgstrtpmuxer.dll
     libgstrtsp.dll
     libgstsmpte.dll
     libgsttheora.dll
@@ -74,13 +77,12 @@ set(gst_plugin_release_files
     libgstvideorate.dll
     libgstvideoscale.dll
     libgstvideosignal.dll
-    libgstvideotestsrc.dll
-    libgstvolume.dll
     libgstvolume.dll
     libgstvorbis.dll
     libgstwasapi.dll
     libgstwavparse.dll
     libgstwininet.dll
+    libgstwinks.dll
     libgstx264.dll
     libgstxvid.dll
     )
@@ -96,14 +98,14 @@ set(all_targets ${all_targets} ${out_targets})
 set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
 set(gst_plugin_debug_files
     libdshowsrcwrapper.dll
-    libfsselector.dll
-    libfsvalve.dll
+    libgsta52.dll
     libgstacmenc.dll
     libgstadder.dll
     libgstalaw.dll
     libgstalpha.dll
     libgstalphacolor.dll
     libgstapp.dll
+    libgstasfdemux.dll
     libgstaudiochunk.dll
     libgstaudioconvert.dll
     libgstaudiofx.dll
@@ -114,41 +116,44 @@ set(gst_plugin_debug_files
     libgstavi.dll
     libgstcoreelements.dll
     libgstcutter.dll
-    libgstdecodebin2.dll
     libgstdecodebin.dll
+    libgstdecodebin2.dll
     libgstdirectdraw.dll
     libgstdirectsound.dll
     libgstdshowdecwrapper.dll
     libgstdshowsrcwrapper.dll
     libgstdshowvideosink.dll
-    libgstdtmf.dll
+    libgstfaad.dll
     libgstffmpeg.dll
     libgstffmpegcolorspace.dll
     libgstflv.dll
+    libgstgamma.dll
     libgstgdp.dll
     libgsth264parse.dll
     libgsticydemux.dll
     libgstid3demux.dll
     libgstjpeg.dll
     libgstlevel.dll
-    libgstmad.dll
     libgstmms.dll
     libgstmpeg2dec.dll
+    libgstmpeg4videoparse.dll
     libgstmpegaudioparse.dll
     libgstmpegstream.dll
     libgstmpegvideoparse.dll
-    libgstmscodecs.dll
     libgstmulaw.dll
     libgstmultipart.dll
     libgstneon.dll
     libgstogg.dll
+    libgstpcapparse.dll
     libgstplaybin.dll
     libgstpng.dll
     libgstqtdemux.dll
     libgstqueue2.dll
+    libgstreal.dll
+    libgstrealmedia.dll
     libgstrtp.dll
     libgstrtpmanager.dll
-    libgstrtpmuxer.dll 
+    libgstrtpmuxer.dll
     libgstrtsp.dll
     libgstsmpte.dll
     libgsttheora.dll
@@ -161,13 +166,12 @@ set(gst_plugin_debug_files
     libgstvideorate.dll
     libgstvideoscale.dll
     libgstvideosignal.dll
-    libgstvideotestsrc.dll
-    libgstvolume.dll
     libgstvolume.dll
     libgstvorbis.dll
     libgstwasapi.dll
     libgstwavparse.dll
     libgstwininet.dll
+    libgstwinks.dll
     libgstx264.dll
     libgstxvid.dll
     )
@@ -220,6 +224,7 @@ set(debug_files
     avformat-52.dll
     avutil-49.dll
     intl.dll
+    libfaacdrm.dll
     libgstapp-0.10.dll
     libgstaudio-0.10.dll
     libgstbase-0.10.dll
@@ -243,10 +248,11 @@ set(debug_files
     libmms.dll
     liboil-0.3-0.dll
     libpng13.dll
-    xvidcore.dll
-    zlib1.dll
+    libspeex.dll
     ogg.dll
     vorbis.dll
+    xvidcore.dll
+    zlib1.dll
     )
 
 copy_if_different(
@@ -294,6 +300,7 @@ set(release_files
     avformat-52.dll
     avutil-49.dll
     intl.dll
+    libfaacdrm.dll
     libgstapp-0.10.dll
     libgstaudio-0.10.dll
     libgstbase-0.10.dll
@@ -317,10 +324,11 @@ set(release_files
     libmms.dll
     liboil-0.3-0.dll
     libpng13.dll
-    xvidcore.dll
-    zlib1.dll
+    libspeex.dll
     ogg.dll
     vorbis.dll
+    xvidcore.dll
+    zlib1.dll
     )
     
 copy_if_different(
diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index da9bcba..7bb65e9 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -45,6 +45,8 @@
 #include "llassetstorage.h"
 
 #include "llmediamanager.h"
+#include "llmediabase.h"
+#include "llmediaimplcommon.h"
 
 // necessary for grabbing sounds from sim (implemented in viewer)       
 extern void request_sound(const LLUUID &sound_guid);
@@ -101,6 +103,8 @@ void LLAudioEngine::setDefaults()
 
         for (U32 i = 0; i < LLAudioEngine::AUDIO_TYPE_COUNT; i++)
                 mSecondaryGain[i] = 1.0f;
+
+        mStatus = LLMediaBase::STATUS_UNKNOWN;
 }
 
 
@@ -168,6 +172,14 @@ void LLAudioEngine::shutdown()
 }
 
 
+////////////////////////////////////////////////////////////////////////////////
+// virtual (derives from LLMediaBase)
+LLMediaBase::EStatus LLAudioEngine::getStatus()
+{
+        return mStatus;
+}
+
+
 // virtual
 void LLAudioEngine::startInternetStream(const std::string& url)
 {
@@ -179,27 +191,40 @@ 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)
+        {
+                LL_INFOS("AudioEngine") << "don't play dead stream urls"<< llendl;
+                mInternetStreamURL.clear();
+                mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
+                mInternetStreamMedia->updateMedia();
+                stopInternetStream();
+                return;
+        }
         
-        if (!url.empty()) {
+        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);
                 mInternetStreamMedia->updateMedia();
-        } else {
+        } 
+        else
+        {
                 LL_INFOS("AudioEngine") << "setting stream to NULL"<< llendl;
                 mInternetStreamURL.clear();
                 mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP);
                 mInternetStreamMedia->updateMedia();
         }
-        //#endif
 }
 
 // virtual
@@ -207,9 +232,10 @@ void LLAudioEngine::stopInternetStream()
 {
         LL_INFOS("AudioEngine") << "entered stopInternetStream()" << llendl;
         
-        if(mInternetStreamMedia)
+    if(mInternetStreamMedia)
         {
-                if( ! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP)){
+                if(!mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_STOP))
+                {
                         LL_INFOS("AudioEngine") << "attempting to stop stream failed!" << llendl;
                 }
                 mInternetStreamMedia->updateMedia();
@@ -219,29 +245,6 @@ void LLAudioEngine::stopInternetStream()
 }
 
 // virtual
-void LLAudioEngine::pauseInternetStream(int pause)
-{
-        LL_INFOS("AudioEngine") << "entered pauseInternetStream()" << llendl;
-
-        if(!mInternetStreamMedia)
-                return;
-        
-        if(pause)
-        {
-                if(! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_PAUSE))
-                {
-                        LL_INFOS("AudioEngine") << "attempting to pause stream failed!" << llendl;
-                }
-        } else {
-                if(! mInternetStreamMedia->addCommand(LLMediaBase::COMMAND_START))
-                {
-                        LL_INFOS("AudioEngine") << "attempting to unpause stream failed!" << llendl;
-                }
-        }
-        mInternetStreamMedia->updateMedia();
-}
-
-// virtual
 void LLAudioEngine::updateInternetStream()
 {
         if (mInternetStreamMedia)
@@ -259,11 +262,6 @@ int LLAudioEngine::isInternetStreamPlaying()
                 return 1; // Active and playing
         }       
 
-        if (mInternetStreamMedia->getStatus() == LLMediaBase::STATUS_PAUSED)
-        {
-                return 2; // paused
-        }
-
         return 0; // Stopped
 }
 
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index 15cb35f..878a96a 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -45,6 +45,8 @@
 #include "llframetimer.h"
 #include "llassettype.h"
 
+#include "llmediabase.h"
+
 class LLMediaBase;
 
 const F32 LL_WIND_UPDATE_INTERVAL = 0.1f;
@@ -153,13 +155,13 @@ public:
         // Internet stream methods
         virtual void startInternetStream(const std::string& url);
         virtual void stopInternetStream();
-        virtual void pauseInternetStream(int pause);
         virtual void updateInternetStream();
         virtual int isInternetStreamPlaying();
         virtual void getInternetStreamInfo(char* artist, char* title);
         // use a value from 0.0 to 1.0, inclusive
         virtual void setInternetStreamGain(F32 vol);
         virtual const std::string& getInternetStreamURL();
+        virtual LLMediaBase::EStatus getStatus();
 
         // For debugging usage
         virtual LLVector3 getListenerPos();
@@ -246,6 +248,8 @@ protected:
 
         LLFrameTimer mWindUpdateTimer;
 
+        LLMediaBase::EStatus mStatus;
+
 private:
         void setDefaults();
         LLMediaBase *mInternetStreamMedia;
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index d42842d..f21ff68 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -324,7 +324,7 @@ S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes)
 S32 LLSDParser::parseLines(std::istream& istr, LLSD& data)
 {
         mCheckLimits = false;
-        mParseLines = false;            // was true, Emergency fix DEV-17785 parsing newline failure
+        mParseLines = true;
         return doParse(istr, data);
 }
 
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 690ab67..9c3f85e 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -461,11 +461,11 @@ S32 LLSDXMLParser::Impl::parseLines(std::istream& input, LLSD& data)
                                 input.clear();
                         }
                 
-                        // Don't parse the NULL at the end which might be added if \n was absorbed by getline()
+                        // Re-insert with the \n that was absorbed by getline()
                         char * text = (char *) buffer;
                         if ( text[num_read - 1] == 0)
                         {
-                                num_read--;
+                                text[num_read - 1] = '\n';
                         }
                 }
 
@@ -808,12 +808,11 @@ void LLSDXMLParser::parsePart(const char *buf, int len)
 // virtual
 S32 LLSDXMLParser::doParse(std::istream& input, LLSD& data) const
 {
-// Remove code - emergency fix DEV-17785 parsing newline failure
-//      if (mParseLines)
-//      {
+        if (mParseLines)
+        {
                 // Use line-based reading (faster code)
-//              return impl.parseLines(input, data);
-//      }
+                return impl.parseLines(input, data);
+        }
 
         return impl.parse(input, data);
 }
diff --git a/linden/indra/llmedia/llmediabase.h b/linden/indra/llmedia/llmediabase.h
index dad02ca..b5b9420 100644
--- a/linden/indra/llmedia/llmediabase.h
+++ b/linden/indra/llmedia/llmediabase.h
@@ -153,7 +153,8 @@ class LLMediaBase
                         STATUS_STARTED          = 3,
                         STATUS_STOPPED          = 4,
                         STATUS_PAUSED           = 6,
-                        STATUS_RESETTING        = 7
+                        STATUS_RESETTING        = 7,
+                        STATUS_DEAD                     = 8
                 };
                 virtual bool addCommand( ECommand cmd ) = 0;
                 virtual bool clearCommand() = 0;
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index bae8ad9..af089bc 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -36,6 +36,7 @@
 
 extern "C" {
 #include <gst/gst.h>
+#include <gst/gstelement.h>
 }
 
 #include "llmediamanager.h"
@@ -72,7 +73,7 @@ LLMediaImplGStreamer () :
         mPump ( NULL ),
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
-        mState( GST_STATE_NULL )
+    mState( GST_STATE_NULL )
 {
         LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL;
         mVolume = -1.0; // XXX Hack to make the vould change happend first time
@@ -94,12 +95,14 @@ LLMediaImplGStreamer () :
                 return; // error
         }
 
-        if (NULL == getenv("LL_GSTREAMER_EXTERNAL")) 
+        if (NULL == getenv("LL_GSTREAMER_EXTERNAL"))
         {
                 // instantiate and connect a custom video sink
                 LL_DEBUGS("MediaManager") << "extrenal video sink..." << LL_ENDL;
+
+                // Plays inworld instead of in external player
                 mVideoSink =
-                        GST_SLVIDEO(llgst_element_factory_make ("private-slvideo", "slvideo"));
+                GST_SLVIDEO(llgst_element_factory_make ("private-slvideo", "slvideo"));
                 if (!mVideoSink)
                 {
                         LL_WARNS("MediaImpl") << "Could not instantiate private-slvideo element." << LL_ENDL;
@@ -142,12 +145,14 @@ LLMediaImplGStreamer::
 // virtual
 std::string LLMediaImplGStreamer::getVersion()
 {
-        std::string rtn;
-        rtn = "[" + sLLMediaImplGStreamerReg.getImplName() + "] - GStreamer 0.10.x";
-        return rtn;
+        guint major, minor, micro, nano;
+        llgst_version(&major, &minor, &micro, &nano);
+        std::string version = llformat("%d.%d.%d.%d",major,minor,micro,nano);
+        return version;
 }
+
 //
-//THIS IS THE METHOD THAT'S BREAKING STUFF
+// STARTUP
 ///////////////////////////////////////////////////////////////////////////////
 // (static) super-initialization - called once at application startup
 bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
@@ -161,6 +166,10 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 // 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") )
                 {
@@ -180,7 +189,7 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 saved_locale = setlocale(LC_ALL, NULL);
                 if (0 == llgst_init_check(NULL, NULL, NULL))
                 {
-                    LL_WARNS("MediaImpl") << "GST init failed for unspecified reason." << LL_ENDL;
+                    LL_WARNS("MediaImpl") << "GStreamer library failed to initialize and load standard plugins." << LL_ENDL;
                         setlocale(LC_ALL, saved_locale.c_str() );
                         return false;
                 }
@@ -204,6 +213,7 @@ bool LLMediaImplGStreamer::closedown()
 
 ///////////////////////////////////////////////////////////////////////////////
 //
+// Uncomment the line below to enable spammy debug data.
 //#define LL_GST_REPORT_STATE_CHANGES
 #ifdef LL_GST_REPORT_STATE_CHANGES
 static const char* get_gst_state_name(GstState state)
@@ -269,7 +279,8 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                                 LL_DEBUGS("MediaImpl") << "State changed to NULL" << LL_ENDL;
 #endif
                                 if (impl->getState() == GST_STATE_PLAYING) 
-                                { // We got stoped by gstremer...
+                                { 
+                                        // Stream was probably dropped, trying to restart
                                     impl->play();
 #ifdef LL_GST_REPORT_STATE_CHANGES
                                     LL_DEBUGS("MediaImpl") << "Trying to restart." << LL_ENDL;
@@ -384,8 +395,7 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
         LL_DEBUGS("MediaImpl") << "Setting media URI: " << urlIn.c_str()
             << LL_ENDL;
 
-        if (NULL == mPump
-            || NULL == mPlaybin)
+        if (mPump == NULL || mPlaybin == NULL)
         {
                 return false;
         }
@@ -394,7 +404,6 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
 
         // set URI
         g_object_set (G_OBJECT (mPlaybin), "uri", urlIn.c_str(), NULL);
-        //g_object_set (G_OBJECT (mPlaybin), "uri", "file:///tmp/movie", NULL);
 
         // get playbin's bus - perhaps this can/should be done in ctor
         GstBus *bus = llgst_pipeline_get_bus (GST_PIPELINE (mPlaybin));
@@ -405,6 +414,8 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
         llgst_bus_add_watch (bus, bus_callback, this);
         llgst_object_unref (bus);
 
+        mState = GST_STATE_READY;
+
         // navigateTo implicitly plays, too.
         play();
 
@@ -437,6 +448,8 @@ bool LLMediaImplGStreamer::unload()
         }
 
         mVideoSink = NULL;
+        mState = GST_STATE_NULL;
+        setStatus(LLMediaBase::STATUS_UNKNOWN);
 
         return true;
 }
@@ -448,15 +461,19 @@ bool LLMediaImplGStreamer::updateMedia()
         //LL_DEBUGS("MediaImpl") << "updating media..." << LL_ENDL;
         
         // sanity check
-        if (NULL == mPump
-            || NULL == mPlaybin)
+        if (mPump == NULL || mPlaybin == NULL)
         {
 #ifdef LL_GST_REPORT_STATE_CHANGES
                 LL_DEBUGS("MediaImpl") << "dead media..." << LL_ENDL;
 #endif
+                mState = GST_STATE_NULL;
+                setStatus(LLMediaBase::STATUS_DEAD);
                 return false;
         }
 
+        if (mState == GST_STATE_VOID_PENDING || mState == GST_STATE_NULL)
+                return false;
+
         // process next outstanding command
         switch (nextCommand())
         {
@@ -567,10 +584,24 @@ bool LLMediaImplGStreamer::updateMedia()
 //
 bool LLMediaImplGStreamer::stop()
 {
-        LL_DEBUGS("MediaImpl") << "stopping media..." << LL_ENDL;
-        // todo: error-check this?
-        llgst_element_set_state(mPlaybin, GST_STATE_READY);
-        mState = GST_STATE_READY;
+        LL_DEBUGS("MediaImpl") << "attempting to stop..." << LL_ENDL;
+
+        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);
+
+        if (mState == GST_STATE_PLAYING)
+                mState = GST_STATE_VOID_PENDING;
+        else
+                mState = 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;
+
         return true;
 }
 
@@ -578,10 +609,29 @@ bool LLMediaImplGStreamer::stop()
 //
 bool LLMediaImplGStreamer::play()
 {
-        LL_DEBUGS("MediaImpl") << "playing media..." << LL_ENDL;
-        // todo: error-check this?
-        llgst_element_set_state(mPlaybin, GST_STATE_PLAYING);
+        LL_DEBUGS("MediaImpl") << "attempting to play..." << LL_ENDL;
+
+        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_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;
+
+        // Check to make sure playing was successful. If not, stop.
+        if (state_change == GST_STATE_CHANGE_FAILURE)
+        {
+                setStatus(LLMediaBase::STATUS_STOPPED);
+                stop();
+        }
+
         return true;
 }
 
@@ -589,10 +639,17 @@ bool LLMediaImplGStreamer::play()
 //
 bool LLMediaImplGStreamer::pause()
 {
-        LL_DEBUGS("MediaImpl") <<"pausing media..." << LL_ENDL;
-        // todo: error-check this?
+        LL_DEBUGS("MediaImpl") << "attempting to pause..." << LL_ENDL;
+
+        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;
+
         return true;
 };
 
@@ -628,12 +685,12 @@ bool LLMediaImplGStreamer::seek(double time)
 // virtual
 bool LLMediaImplGStreamer::setVolume(float volume)
 {
-        // XXX hack to make volume volume changes less othen
+    // XXX hack to make volume volume changes less othen
         //     bug in gstreamer 0.10.21
         if(mVolume == volume)
             return true;
 
-        LL_DEBUGS("MediaImpl") << "setVolume(" << volume << ") : " << getpid() << LL_ENDL;
+    LL_DEBUGS("MediaImpl") << "setVolume(" << volume << ") : " << getpid() << LL_ENDL;
         mVolume = volume;
         if (mPlaybin)
         {
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 5b493ad..dec970a 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -74,7 +74,7 @@ class LLMediaImplGStreamer:
                 /* virtual */ int getTextureFormatType() const;
                 /* virtual */ int getTextureFormatInternal() const;
                 /* virtual */ bool seek( double time );
-                /* virtual */ bool setVolume( float volume );
+            /* virtual */ bool setVolume( float volume );
 
                 LLMediaEmitter< LLMediaObserver > getEventEmitter() const {return mEventEmitter;};
 
@@ -84,6 +84,7 @@ class LLMediaImplGStreamer:
                 bool pause();
                 bool stop();
                 bool play();
+                        
                 static gboolean bus_callback (GstBus     *bus,
                                               GstMessage *message,
                                               gpointer    data);
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
index e17a7a0..0d0d764 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
@@ -7,7 +7,9 @@ LL_GST_SYM(true, gst_message_parse_error, void, GstMessage *message, GError **ge
 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);
@@ -35,6 +37,8 @@ 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);
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index 9ce0bab..467502b 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -177,7 +177,8 @@ LLPumpIO::LLPumpIO(apr_pool_t* pool) :
         mCurrentPool(NULL),
         mCurrentPoolReallocCount(0),
         mChainsMutex(NULL),
-        mCallbackMutex(NULL)
+        mCallbackMutex(NULL),
+        mCurrentChain(mRunningChains.end())
 {
         LLMemType m1(LLMemType::MTYPE_IO_PUMP);
         initialize(pool);
@@ -273,7 +274,10 @@ bool LLPumpIO::setTimeoutSeconds(F32 timeout)
 void LLPumpIO::adjustTimeoutSeconds(F32 delta)
 {
         // If no chain is running, bail
-        if(current_chain_t() == mCurrentChain) return;
+        if(mRunningChains.end() == mCurrentChain) 
+        {
+                return;
+        }
         (*mCurrentChain).adjustTimeoutSeconds(delta);
 }
 
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index 2ac1319..fd8953d 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -598,6 +598,7 @@ char* _PREHASH_FromAgentId = LLMessageStringTable::getInstance()->getString("Fro
 char* _PREHASH_Type = LLMessageStringTable::getInstance()->getString("Type");
 char* _PREHASH_ChatType = LLMessageStringTable::getInstance()->getString("ChatType");
 char* _PREHASH_ReportData = LLMessageStringTable::getInstance()->getString("ReportData");
+char* _PREHASH_MonoScore = LLMessageStringTable::getInstance()->getString("MonoScore");
 char* _PREHASH_RequestBlock = LLMessageStringTable::getInstance()->getString("RequestBlock");
 char* _PREHASH_GrantData = LLMessageStringTable::getInstance()->getString("GrantData");
 char* _PREHASH_DetachAttachmentIntoInv = LLMessageStringTable::getInstance()->getString("DetachAttachmentIntoInv");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index 0ee02be..8b8c857 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -598,6 +598,7 @@ extern char * _PREHASH_FromAgentId;
 extern char * _PREHASH_Type;
 extern char * _PREHASH_ChatType;
 extern char * _PREHASH_ReportData;
+extern char * _PREHASH_MonoScore;
 extern char * _PREHASH_RequestBlock;
 extern char * _PREHASH_GrantData;
 extern char * _PREHASH_DetachAttachmentIntoInv;
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 4024fdd..1e48d28 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1120,6 +1120,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/menu_login.xml
     skins/default/xui/en-us/menu_pie_attachment.xml
     skins/default/xui/en-us/menu_pie_avatar.xml
+    skins/default/xui/en-us/menu_pie_hud.xml
     skins/default/xui/en-us/menu_pie_land.xml
     skins/default/xui/en-us/menu_pie_object.xml
     skins/default/xui/en-us/menu_pie_self.xml
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 4953410..aeca4b5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -42,6 +42,7 @@
 #include "llcurl.h"
 #include "llimagej2c.h"
 #include "audioengine.h"
+#include "llmediaimplgstreamer.h"
 
 #include "llviewertexteditor.h"
 #include "llviewercontrol.h"
@@ -208,6 +209,15 @@ LLFloaterAbout::LLFloaterAbout()
         LLMediaManager *mgr = LLMediaManager::getInstance();
         if (mgr)
         {
+                LLMediaBase *gstreamer = new LLMediaImplGStreamer();
+                if (gstreamer)
+                {
+                        support.append("GStreamer Version: ");
+                        support.append( gstreamer->getVersion() );
+                        support.append("\n");
+                } 
+                delete gstreamer;
+
                 LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html");
                 if (media_source)
                 {
diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index ada5c68..e4c90f0 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -180,11 +180,11 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
                 msg->getF32Fast(_PREHASH_ReportData, _PREHASH_Score, score, block);
                 msg->getStringFast(_PREHASH_ReportData, _PREHASH_TaskName, name_buf, block);
                 msg->getStringFast(_PREHASH_ReportData, _PREHASH_OwnerName, owner_buf, block);
-                if(msg->getNumberOfBlocks("DataExtended"))
+                if(msg->has("DataExtended"))
                 {
                         have_extended_data = true;
                         msg->getU32("DataExtended", "TimeStamp", time_stamp, block);
-                        msg->getF32(_PREHASH_ReportData, "MonoScore", mono_score, block);
+                        msg->getF32("DataExtended", "MonoScore", mono_score, block);
                 }
 
                 LLSD element;
@@ -212,7 +212,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
                 if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS
                         && have_extended_data)
                 {
-                        element["columns"][5]["column"] = "Mono Time";
+                        element["columns"][5]["column"] = "mono_time";
                         element["columns"][5]["value"] = llformat("%0.3f", mono_score);
                         element["columns"][5]["font"] = "SANSSERIF";
                 }
@@ -238,6 +238,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
         {
                 setTitle(getString("top_scripts_title"));
                 list->setColumnLabel("score", getString("scripts_score_label"));
+                list->setColumnLabel("mono_time", getString("scripts_mono_time_label"));
                 
                 LLUIString format = getString("top_scripts_text");
                 format.setArg("[COUNT]", llformat("%d", total_count));
@@ -248,6 +249,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
         {
                 setTitle(getString("top_colliders_title"));
                 list->setColumnLabel("score", getString("colliders_score_label"));
+                list->setColumnLabel("mono_time", "");
                 LLUIString format = getString("top_colliders_text");
                 format.setArg("[COUNT]", llformat("%d", total_count));
                 childSetValue("title_text", LLSD(format));
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 80cac14..a4eedbb 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -391,14 +391,6 @@ void LLOverlayBar::toggleMusicPlay(void*)
                         }
                 }
         }
-        //else
-        //{
-        //      gOverlayBar->mMusicState = PAUSED; // desired state
-        //      if (gAudiop)
-        //      {
-        //              gAudiop->pauseInternetStream(1);
-        //      }
-        //}
         else
         {
                 gOverlayBar->mMusicState = STOPPED; // desired state
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index 01d77f6..20b0ee5 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -90,7 +90,17 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
 {
         
         mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
-        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        if (show_keep_discard)
+        {
+                // Decided against this, a text notification is a better fix for this -- McCabe
+                //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap());
+                //childSetAction("Discard btn",onDiscardBtn,this);
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        }
+
 
         /*
         childSetCommitCallback("desc_editor", LLPreview::onText, this);
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 7547dd2..fe1755b 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -3444,7 +3444,7 @@ void LLSelectMgr::deselectAllIfTooFar()
 
         // HACK: Don't deselect when we're navigating to rate an object's
         // owner or creator.  JC
-        if (gPieObject->getVisible() || gPieRate->getVisible() )
+        if (gPieObject->getVisible())
         {
                 return;
         }
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index de10045..63b6e34 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -336,10 +336,14 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 
                         gPieAvatar->show(x, y, mPieMouseButtonDown);
                 }
-                else if (object->isAttachment())
+                else if (object->isAttachment() && !object->isHUDAttachment())
                 {
                         gPieAttachment->show(x, y, mPieMouseButtonDown);
                 }
+                else if (object->isHUDAttachment())
+                {
+                        gPieHUD->show(x, y, mPieMouseButtonDown);
+                }
                 else
                 {
                         // BUG: What about chatting child objects?
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b7f4a40..31fdcc3 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -251,6 +251,7 @@ LLPieMenu	*gPieSelf	= NULL;
 LLPieMenu       *gPieAvatar = NULL;
 LLPieMenu       *gPieObject = NULL;
 LLPieMenu       *gPieAttachment = NULL;
+LLPieMenu       *gPieHUD = NULL;
 LLPieMenu       *gPieLand       = NULL;
 
 // local constants
@@ -263,7 +264,6 @@ const std::string SAVE_INTO_TASK_INVENTORY("Save Object Back to Object Contents"
 LLMenuGL* gAttachSubMenu = NULL;
 LLMenuGL* gDetachSubMenu = NULL;
 LLMenuGL* gTakeOffClothes = NULL;
-LLPieMenu* gPieRate = NULL;
 LLPieMenu* gAttachScreenPieMenu = NULL;
 LLPieMenu* gAttachPieMenu = NULL;
 LLPieMenu* gAttachBodyPartPieMenus[8];
@@ -610,10 +610,11 @@ void init_menus()
 
         gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD");
         gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach");
-        gPieRate = gMenuHolder->getChild<LLPieMenu>("Rate Menu");
 
         gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
 
+        gPieHUD = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_hud.xml", gMenuHolder);
+
         gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder);
 
         ///
@@ -626,6 +627,7 @@ void init_menus()
         gPieAvatar->setBackgroundColor( pie_color );
         gPieObject->setBackgroundColor( pie_color );
         gPieAttachment->setBackgroundColor( pie_color );
+        gPieHUD->setBackgroundColor( pie_color );
         gPieLand->setBackgroundColor( pie_color );
 
         color = gColors.getColor( "MenuPopupBgColor" );
@@ -1475,6 +1477,9 @@ void cleanup_menus()
         delete gPieAttachment;
         gPieAttachment = NULL;
 
+        delete gPieHUD;
+        gPieHUD = NULL;
+
         delete gPieLand;
         gPieLand = NULL;
 
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index e003e90..c2f880e 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -147,14 +147,15 @@ extern LLPieMenu	*gPieSelf;
 extern LLPieMenu        *gPieAvatar;
 extern LLPieMenu        *gPieObject;
 extern LLPieMenu        *gPieAttachment;
+extern LLPieMenu        *gPieHUD;
 extern LLPieMenu        *gPieLand;
-extern LLPieMenu*       gPieRate;
 
 // Pie menus
 extern LLPieMenu        *gPieSelfSimple;
 extern LLPieMenu        *gPieAvatarSimple;
 extern LLPieMenu        *gPieObjectSimple;
 extern LLPieMenu        *gPieAttachmentSimple;
+extern LLPieMenu        *gPieHUDSimple;
 extern LLPieMenu        *gPieLandSimple;
 
 // Needed to build menus when attachment site list available
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
index 96f48eb..1b60510 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_top_objects.xml
@@ -14,7 +14,8 @@
                 <column label="Owner" name="owner" width="105" />
                 <column label="Location" name="location" width="130" />
                 <column label="Time" name="time" width="100" />
-        </scroll_list>
+        <column label="Mono Time" name="mono_time" width="55" />
+    </scroll_list>
         <text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
              left="10" name="id_text" width="100">
                 Object ID:
@@ -61,7 +62,10 @@
         <string name="scripts_score_label">
                 Time
         </string>
-        <string name="top_colliders_title">
+    <string name="scripts_mono_time_label">
+        Mono Time
+    </string>
+    <string name="top_colliders_title">
                 Top Colliders
         </string>
         <string name="top_colliders_text">
@@ -70,7 +74,7 @@
         <string name="colliders_score_label">
                 Score
         </string>
-        <string name="none_descriptor">
+    <string name="none_descriptor">
                 None found.
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml
new file mode 100644
index 0000000..ba6db28
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Hud Pie">
+        <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
+                <on_click function="Attachment.Detach" />
+                <on_enable function="Attachment.EnableDetach" />
+        </menu_item_call>
+   <menu_item_separator />
+  <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Attachment Touch">
+    <on_click function="Object.Touch" />
+    <on_enable function="Attachment.EnableTouch" userdata="Touch" />
+  </menu_item_call>
+   <menu_item_separator />
+   <menu_item_separator />
+   <menu_item_separator />
+        <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
+                <on_click function="Object.Edit" />
+                <on_enable function="EnableEdit" />
+        </menu_item_call>
+   <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
+     <on_click function="Attachment.Drop" />
+     <on_enable function="Attachment.EnableDrop" />
+   </menu_item_call>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 2d5402b..4758116 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1064,42 +1064,42 @@
       <menu name="Features" drop_shadow="true"
             opaque="true" tear_off="true">
         <menu_item_check name="UI" label="UI"
-                         shortcut="control|alt|F1">
+                         shortcut="alt|shift|F1">
           <on_click function="Advanced.ToggleFeature"
                     userdata="ui" />
           <on_check function="Advanced.CheckFeature"
                     userdata="ui" />
         </menu_item_check>
         <menu_item_check name="Selected" label="Selected"
-                         shortcut="control|alt|F2">
+                         shortcut="alt|shift|F2">
           <on_click function="Advanced.ToggleFeature"
                     userdata="selected" />
           <on_check function="Advanced.CheckFeature"
                     userdata="selected" />
         </menu_item_check>
         <menu_item_check name="Highlighted" label="Highlighted"
-                         shortcut="control|alt|F3">
+                         shortcut="alt|shift|F3">
           <on_click function="Advanced.ToggleFeature"
                     userdata="highlighted" />
           <on_check function="Advanced.CheckFeature"
                     userdata="highlighted" />
         </menu_item_check>
         <menu_item_check name="Dynamic Textures" label="Dynamic Textures"
-                         shortcut="control|alt|F4">
+                         shortcut="alt|shift|F4">
           <on_click function="Advanced.ToggleFeature"
                     userdata="dynamic textures" />
           <on_check function="Advanced.CheckFeature"
                     userdata="dynamic textures" />
         </menu_item_check>
         <menu_item_check name="Foot Shadows" label="Foot Shadows"
-                         shortcut="control|alt|F5">
+                         shortcut="alt|shift|F5">
           <on_click function="Advanced.ToggleFeature"
                     userdata="foot shadows" />
           <on_check function="Advanced.CheckFeature"
                     userdata="foot shadows" />
         </menu_item_check>
         <menu_item_check name="Fog" label="Fog"
-                         shortcut="control|alt|F6">
+                         shortcut="alt|shift|F6">
           <on_click function="Advanced.ToggleFeature"
                     userdata="fog" />
           <on_check function="Advanced.CheckFeature"
@@ -1107,14 +1107,14 @@
         </menu_item_check>
         <menu_item_check name="Palletized Textures"
                          label="Palletized Textures"
-                         shortcut="control|alt|F7">
+                         shortcut="alt|shift|F7">
           <on_click function="Advanced.ToggleFeature"
                     userdata="palette" />
           <on_check function="Advanced.CheckFeature"
                     userdata="palette" />
         </menu_item_check>
         <menu_item_check name="Test FRInfo" label="Test FRInfo"
-                         shortcut="control|alt|F8">
+                         shortcut="alt|shift|F8">
           <on_click function="Advanced.ToggleFeature"
                     userdata="fr info" />
           <on_check function="Advanced.CheckFeature"
@@ -1122,7 +1122,7 @@
         </menu_item_check>
         <menu_item_check name="Flexible Objects"
                          label="Flexible Objects"
-                         shortcut="control|alt|F9">
+                         shortcut="alt|shift|F9">
           <on_click function="Advanced.ToggleFeature"
                     userdata="flexible" />
           <on_check function="Advanced.CheckFeature"