10 files changed, 93 insertions, 115 deletions

diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 18afc45..bae8ad9 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -43,10 +43,6 @@ extern "C" {
 
 #include "llmediaimplgstreamervidplug.h"
 
-#ifdef LL_GST_SOUNDSINK
-#include "llmediaimplgstreamersndplug.h"
-#endif // LL_GST_SOUNDSINK
-
 #include "llmediaimplgstreamer_syms.h"
 
 #include "llerror.h"
@@ -77,9 +73,6 @@ LLMediaImplGStreamer () :
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
         mState( GST_STATE_NULL )
-#ifdef LL_GST_SOUNDSINK
-        ,mAudioSink ( NULL )
-#endif // LL_GST_SOUNDSINK
 {
         LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL;
         mVolume = -1.0; // XXX Hack to make the vould change happend first time
@@ -115,21 +108,6 @@ LLMediaImplGStreamer () :
                 }
 
                 g_object_set(mPlaybin, "video-sink", mVideoSink, NULL);
-
-#ifdef LL_GST_SOUNDSINK
-                LL_DEBUGS("MediaManager") << "extrenal audio sink..." << LL_ENDL;
-                // instantiate and connect a custom audio sink
-                mAudioSink =
-                        GST_SLSOUND(llgst_element_factory_make ("private-slsound", "slsound"));
-                if (!mAudioSink)
-                {
-                        LL_WARN("MediaImpl") << "Could not instantiate private-slsound element." << LL_ENDL;
-                        // todo: cleanup.
-                        return; // error
-                }
-
-                g_object_set(mPlaybin, "audio-sink", mAudioSink, NULL);
-#endif
         }
 }
 
@@ -210,9 +188,6 @@ bool LLMediaImplGStreamer::startup (LLMediaManagerData* init_data)
                 
                 // Init our custom plugins - only really need do this once.
                 gst_slvideo_init_class();
-#if 0
-                gst_slsound_init_class();
-#endif
 
                 done_init = true;
         }
@@ -360,7 +335,6 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 }
                 case GST_MESSAGE_TAG: 
                 {
-#if 0
                 GstTagList *tag_list;
                 gchar *title;
                 gchar *artist;
@@ -370,10 +344,9 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 gboolean hazArtist = llgst_tag_list_get_string(tag_list,
                         GST_TAG_ARTIST, &artist);
                 if(hazTitle) 
-                    LL_INFOS("MediaInfo") << "Title is " << title << LL_ENDL;
+                        LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
                 if(hazArtist) 
-                    LL_INFOS("MediaInfo") << "Artist is " << artist << LL_ENDL;
-#endif
+                        LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL;
                         break;
                 }
                 case GST_MESSAGE_EOS:
@@ -412,9 +385,6 @@ bool LLMediaImplGStreamer::navigateTo (const std::string urlIn)
             << LL_ENDL;
 
         if (NULL == mPump
-#ifdef LL_GST_SOUNDSINK
-            || NULL == mAudioSink
-#endif
             || NULL == mPlaybin)
         {
                 return false;
@@ -479,9 +449,6 @@ bool LLMediaImplGStreamer::updateMedia()
         
         // sanity check
         if (NULL == mPump
-#ifdef LL_GST_SOUNDSINK
-            || NULL == mAudioSink
-#endif
             || NULL == mPlaybin)
         {
 #ifdef LL_GST_REPORT_STATE_CHANGES
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index 4b9353b..5b493ad 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -31,7 +31,7 @@
  */
 
 // header guard
-///#ifndef llmediaimplgstreamer_h
+#ifndef llmediaimplgstreamer_h
 #define llmediaimplgstreamer_h
 
 #include "llmediaimplcommon.h"
@@ -42,14 +42,12 @@
 extern "C" {
 #include <stdio.h>
 #include <gst/gst.h>
-#include <apr_pools.h>
-#include <apr_dso.h>
+
+#include "apr_pools.h"
+#include "apr_dso.h"
 }
 
 #include "llmediaimplgstreamervidplug.h"
-#ifdef LL_GST_SOUNDSINK
-#include "llmediaimplgstreamersndplug.h"
-#endif // LL_GST_SOUNDSINK
 
 class LLMediaManagerData;
 class LLMediaImplMaker;
@@ -100,9 +98,6 @@ class LLMediaImplGStreamer:
                 GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
                 GstState mState;
-#ifdef LL_GST_SOUNDSINK
-                GstSLSound *mAudioSink;
-#endif // LL_GST_SOUNDSINK
                 GstState getState() const { return mState; }
 };
 
@@ -132,4 +127,4 @@ public:
 
 ///#endif // LL_GSTREAMER_ENABLED
 
-///#endif // llmediaimplgstreamer_h
+#endif // llmediaimplgstreamer_h
diff --git a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
index 08ba6df..e17a7a0 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
+++ b/linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc
@@ -40,3 +40,7 @@ LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSe
 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/llmediaimplgstreamervidplug.cpp b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
index 892c50d..c95ef36 100644
--- a/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamervidplug.cpp
@@ -68,10 +68,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE (
     GST_STATIC_CAPS (SLV_ALLCAPS)
     );
 
-GST_BOILERPLATE (GstSLVideo, 
-                                 gst_slvideo, 
-                                 GstVideoSink, 
-                                 GST_TYPE_VIDEO_SINK);
+GST_BOILERPLATE (GstSLVideo, gst_slvideo, GstVideoSink,
+    GST_TYPE_VIDEO_SINK);
 
 static void gst_slvideo_set_property (GObject * object, guint prop_id,
                                       const GValue * value,
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 72d8f17..714ee7c 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -35,6 +35,7 @@
 
 #include "lltexteditor.h"
 
+#include "llerror.h"
 #include "llfontgl.h"
 #include "llrender.h"
 #include "llui.h"
@@ -57,6 +58,7 @@
 #include "llimagegl.h"
 #include "llwindow.h"
 #include <queue>
+#include <stdexcept>
 
 // 
 // Globals
@@ -3537,6 +3539,7 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
                 std::string text = new_text;
                 while ( findHTML(text, &start, &end) )
                 {
+
                         LLStyleSP html(new LLStyle);
                         html->setVisible(true);
                         html->setColor(mLinkColor);
@@ -3624,10 +3627,6 @@ void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool
         {
                 mSelectionStart = selection_start;
                 mSelectionEnd = selection_end;
-
-
-
-
                 mIsSelecting = was_selecting;
                 setCursorPos(cursor_pos);
         }
@@ -4272,6 +4271,7 @@ S32 LLTextEditor::findHTMLToken(const std::string &line, S32 pos, BOOL reverse)
                                 return index+1;
                         }
                 }
+                index = 0; // Can't be before first charater
         } 
         else
         {
@@ -4322,21 +4322,34 @@ BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end) const
         {
                 *begin = findHTMLToken(line, m1, TRUE);
                 *end   = findHTMLToken(line, m1, FALSE);
+
+                // Can't start before the first char
+                if(*begin < 0) 
+                { 
+                    //*begin = 0;
+                }
                 
                 //Load_url only handles http and https so don't hilite ftp, smb, etc.
-                m2 = line.substr(*begin,(m1 - *begin)).find("http");
-                m3 = line.substr(*begin,(m1 - *begin)).find("secondlife");
-        
-                std::string badneighbors=".,<>?';\"][}{=-+_)(*&^%$#@!~`\t\r\n\\";
-        
-                if (m2 >= 0 || m3>=0)
+                try
                 {
-                        S32 bn = badneighbors.find(line.substr(m1+3,1));
-                        
-                        if (bn < 0)
-                        {
-                                matched = TRUE;
+                    m2 = line.substr(*begin,(m1 - *begin)).find("http");
+                    m3 = line.substr(*begin,(m1 - *begin)).find("secondlife");
+
+                    std::string badneighbors=".,<>?';\"][}{=-+_)(*&^%$#@!~`\t\r\n\\";
+
+                    if (m2 >= 0 || m3>=0)
+                    {
+                                S32 bn = badneighbors.find(line.substr(m1+3,1));
+
+                                if (bn < 0)
+                                {
+                                        matched = TRUE;
+                                }
                         }
+                } 
+                catch ( std::out_of_range outOfRange )
+                {
+                    LL_WARNS("TextEditor") << "got std::out_of_range exception \"" << line << "\"" << LL_ENDL;
                 }
         }
 /*      matches things like secondlife.com (no http://) needs a whitelist to really be effective.
@@ -4369,41 +4382,49 @@ BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end) const
         {
                 S32 strpos, strpos2;
 
-                std::string url     = line.substr(*begin,*end - *begin);
-                std::string slurlID = "slurl.com/secondlife/";
-                strpos = url.find(slurlID);
-                
-                if (strpos < 0)
+                try
                 {
-                        slurlID="secondlife://";
-                        strpos = url.find(slurlID);
-                }
-        
-                if (strpos < 0)
-                {
-                        slurlID="sl://";
-                        strpos = url.find(slurlID);
-                }
-        
-                if (strpos >= 0) 
-                {
-                        strpos+=slurlID.length();
-                        
-                        while ( ( strpos2=url.find("/",strpos) ) == -1 ) 
-                        {
-                                if ((*end+2) >= (S32)line.length() || line.substr(*end,1) != " " )
+                    std::string url     = line.substr(*begin,*end - *begin);
+                    std::string slurlID = "slurl.com/secondlife/";
+                    strpos = url.find(slurlID);
+
+                    if (strpos < 0)
+                    {
+                                slurlID="secondlife://";
+                                strpos = url.find(slurlID);
+                    }
+
+                    if (strpos < 0)
+                    {
+                                slurlID="sl://";
+                                strpos = url.find(slurlID);
+                    }
+
+                    if (strpos >= 0) 
+                    {
+                                strpos+=slurlID.length();
+
+                                while ( ( strpos2=url.find("/",strpos) ) == -1 ) 
                                 {
-                                        matched=FALSE;
-                                        break;
+                                        if ((*end+2) >= (S32)line.length() || line.substr(*end,1) != " " )
+                                        {
+                                                matched=FALSE;
+                                                break;
+                                        }
+
+                                        strpos = (*end + 1) - *begin;
+
+                                        *end = findHTMLToken(line,(*begin + strpos),FALSE);
+                                        url = line.substr(*begin,*end - *begin);
                                 }
-                                
-                                strpos = (*end + 1) - *begin;
-                                                                
-                                *end = findHTMLToken(line,(*begin + strpos),FALSE);
-                                url = line.substr(*begin,*end - *begin);
-                        }
+                    }
+
                 }
 
+                catch ( std::out_of_range outOfRange )
+                {
+                    LL_WARNS("TextEditor") << "got std::out_of_range exception \"" << line << "\"" << LL_ENDL;
+                }
         }
         
         if (!matched)
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index fbb620c..7405aad 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -284,7 +284,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>1.0</real>
+      <real>0.5</real>
     </map>
     <key>AudioLevelUI</key>
     <map>
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index dba603b..01d77f6 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -90,15 +90,7 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
 {
         
         mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
-        if (show_keep_discard)
-        {
-                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());
-        }
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
 
         /*
         childSetCommitCallback("desc_editor", LLPreview::onText, this);
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 4543ae4..b947f95 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -111,6 +111,7 @@
 #include "llui.h"                       // for make_ui_sound
 #include "lluploaddialog.h"
 #include "llviewercamera.h"
+#include "llviewercontrol.h"
 #include "llviewergenericmessage.h"
 #include "llviewerinventory.h"
 #include "llviewermenu.h"
@@ -3291,6 +3292,9 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         pos_global.mdV[VY] += pos_local.mV[VY];
         pos_global.mdV[VZ] += pos_local.mV[VZ];
 
+        // Don't play sounds if sound settings are muted.
+        if (gSavedSettings.getBOOL("MuteSounds")) return;
+
         // Don't play a trigger sound if you can't hear it due
         // to parcel "local audio only" settings.
         if (!LLViewerParcelMgr::getInstance()->canHearSound(pos_global)) return;
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index c560ced..cb3afc5 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -2766,7 +2766,7 @@ BOOL LLViewerObject::updateLOD()
         // Update volume of looping sounds
         if (mAudioSourcep && mAudioSourcep->isLoop())
         {
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (mAudioGain * gSavedSettings.getF32("AudioLevelSFX"));
+                F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
                 mAudioSourcep->setGain(volume);
         }
         return FALSE;
@@ -4331,7 +4331,7 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
         {
                 BOOL queue = flags & LL_SOUND_FLAG_QUEUE;
                 mAudioGain = gain;
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : gain * gSavedSettings.getF32("AudioLevelSFX");
+                F32 volume = gain * gSavedSettings.getF32("AudioLevelSFX");
                 mAudioSourcep->setGain(volume);
                 mAudioSourcep->setLoop(flags & LL_SOUND_FLAG_LOOP);
                 mAudioSourcep->setSyncMaster(flags & LL_SOUND_FLAG_SYNC_MASTER);
@@ -4370,7 +4370,7 @@ void LLViewerObject::adjustAudioGain(const F32 gain)
         if (mAudioSourcep)
         {
                 mAudioGain = gain;
-                F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
+                F32 volume = mAudioGain * gSavedSettings.getF32("AudioLevelSFX");
                 mAudioSourcep->setGain(volume);
         }
 }
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d41f72e..fd2487b 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3797,7 +3797,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
         const LLUUID AGENT_FOOTSTEP_ANIMS[] = {ANIM_AGENT_WALK, ANIM_AGENT_RUN, ANIM_AGENT_LAND};
         const S32 NUM_AGENT_FOOTSTEP_ANIMS = sizeof(AGENT_FOOTSTEP_ANIMS) / sizeof(LLUUID);
 
-        if ( gAudiop && isAnyAnimationSignaled(AGENT_FOOTSTEP_ANIMS, NUM_AGENT_FOOTSTEP_ANIMS) )
+        if ( gAudiop && !gSavedSettings.getBOOL("MuteAmbient") && isAnyAnimationSignaled(AGENT_FOOTSTEP_ANIMS, NUM_AGENT_FOOTSTEP_ANIMS) )
         {
                 BOOL playSound = FALSE;
                 LLVector3 foot_pos_agent;
@@ -3828,7 +3828,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 //                                                      AUDIO_STEP_LO_SPEED, AUDIO_STEP_HI_SPEED,
 //                                                      AUDIO_STEP_LO_GAIN, AUDIO_STEP_HI_GAIN );
 
-                        const F32 STEP_VOLUME = 0.5f;
+                        const F32 STEP_VOLUME = 0.2f;
                         LLUUID& step_sound_id = getStepSound();
 
                         LLVector3d foot_pos_global = gAgent.getPosGlobalFromAgent(foot_pos_agent);
@@ -4800,7 +4800,7 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
         {
                 if (anim_id == ANIM_AGENT_TYPE)
                 {
-                        if (gAudiop)
+                        if (gAudiop && !gSavedSettings.getBOOL("MuteAmbient"))
                         {
                                 LLVector3d char_pos_global = gAgent.getPosGlobalFromAgent(getCharacterPosition());
                                 if (LLViewerParcelMgr::getInstance()->canHearSound(char_pos_global)
@@ -4814,11 +4814,8 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
                                         //      gAudiop->triggerSound(LLUUID(gSavedSettings.getString("UISndTyping")), volume);
                                         //}
                                         //else
-                                        {
-                                                LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
-                                                gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
-
-                                        }
+                                        LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
+                                        gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);
                                 }
                         }
                 }