2 files changed, 77 insertions, 21 deletions

diff --git a/linden/indra/newview/llviewergesture.cpp b/linden/indra/newview/llviewergesture.cpp
index a080663..d99a3a8 100644
--- a/linden/indra/newview/llviewergesture.cpp
+++ b/linden/indra/newview/llviewergesture.cpp
@@ -43,6 +43,7 @@
 #include "llinventorymodel.h"
 #include "llvoavatar.h"
 #include "llxfermanager.h"
+#include "llviewercontrol.h"
 #include "llviewermessage.h" // send_guid_sound_trigger
 #include "llviewernetwork.h"
 #include "llagent.h"
@@ -50,7 +51,7 @@
 // Globals
 LLViewerGestureList gGestureList;
 
-const F32 LLViewerGesture::SOUND_VOLUME = 1.f;
+const F32 LLViewerGesture::SOUND_VOLUME = gSavedSettings.getBOOL("MuteSounds") ?  0.f : 1.f;
 
 LLViewerGesture::LLViewerGesture()
 :       LLGesture()
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index d8261c2..7540ce1 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -44,16 +44,6 @@ class ViewerManifest(LLManifest):
         self.exclude("*.svn*")
         self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
         self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
-        self.path(src="../../../ChangeLog.txt", dst="doc/ChangeLog.txt")
-        self.path(src="../../../CONTRIBUTE.txt", dst="doc/CONTRIBUTE.txt")
-        self.path(src="../../../MANIFESTO.txt", dst="doc/MANIFESTO.txt")
-        self.path(src="../../../README.txt", dst="doc/README.txt")
-        self.path(src="../../../RELEASE_NOTES.txt", dst="doc/RELEASE_NOTES.txt")
-        self.path(src="../../doc/contributions.txt", dst="doc/ll-contributions.txt")
-        self.path(src="../../doc/FLOSS-exception.txt", dst="doc/FLOSS-exception.txt")
-        self.path(src="../../doc/GPL-license.txt", dst="doc/GPL-license.txt")
-        self.path(src="../../doc/releasenotes-where.txt", dst="doc/ll-releasenotes-where.txt")
-# 
 
         if self.prefix(src="app_settings"):
             self.exclude("logcontrol.xml")
@@ -666,20 +656,91 @@ class Linux_i686Manifest(LinuxManifest):
         self.path("app_settings/mozilla-runtime-linux-i686")
 
         if self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
-#            self.path("libfmod-3.75.so")
             self.path("libapr-1.so.0")
             self.path("libaprutil-1.so.0")
             self.path("libdb-4.2.so")
             self.path("libcrypto.so.0.9.7")
             self.path("libexpat.so.1")
             self.path("libssl.so.0.9.7")
-#            self.path("libstdc++.so.6")
             self.path("libuuid.so", "libuuid.so.1")
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.2")
-            #self.path("libtcmalloc.so.0") - bugged
-            #self.path("libstacktrace.so.0") - probably bugged
+
+            self.path("libopenal.so") # symlink
+            self.path("libopenal.so.1")
+            self.path("libalut.so")
+
+            # Gstreamer libs
+            self.path("libgstbase-0.10.so") # symlink
+            self.path("libgstbase-0.10.so.0")
+            self.path("libgstreamer-0.10.so") # symlink
+            self.path("libgstreamer-0.10.so.0")
+            self.path("libgstaudio-0.10.so.0")
+            self.path("libgstbase-0.10.so.0")
+            self.path("libgstcontroller-0.10.so.0")
+            self.path("libgstdataprotocol-0.10.so.0")
+            self.path("libgstinterfaces-0.10.so.0")
+            self.path("libgstnetbuffer-0.10.so.0")
+            self.path("libgstpbutils-0.10.so.0")
+            self.path("libgstriff-0.10.so.0")
+            self.path("libgstrtp-0.10.so.0")
+            self.path("libgstrtsp-0.10.so.0")
+            self.path("libgstsdp-0.10.so.0")
+            self.path("libgsttag-0.10.so.0")
+            self.path("libgstvideo-0.10.so.0")
+
+            # Gstreamer plugin dependencies
+            self.path("libavcodec.so.52")
+            self.path("libavformat.so.52")
+            self.path("libavutil.so.49")
+            self.path("libxvidcore.so.4")
+            self.path("libfaac.so.0")
+            self.path("libfaad.so.1")
+            self.path("libmp3lame.so.0")
+            self.path("libogg.so.0")
+            self.path("libvorbis.so.0")
+            self.path("libvorbisenc.so.2")
+            self.path("libxml2.so.2")
+            self.path("libxvidcore.so.4")
+
+            # Gstreamer plugins
+            if self.prefix("gstreamer-plugins"):
+                self.path("libgstalsa.so")
+                self.path("libgstasf.so")
+                self.path("libgstaudioconvert.so")
+                self.path("libgstaudioresample.so")
+                self.path("libgstautodetect.so")
+                self.path("libgstavi.so")
+                self.path("libgstcoreelements.so")
+                self.path("libgstcoreindexers.so")
+                self.path("libgstdecodebin2.so")
+                self.path("libgstdecodebin.so")
+                self.path("libgstesd.so")
+                self.path("libgstffmpegcolorspace.so")
+                self.path("libgstffmpeg.so")
+                self.path("libgstgnomevfs.so")
+                self.path("libgsticydemux.so")
+                self.path("libgstid3demux.so")
+                self.path("libgstmpegdemux.so")
+                self.path("libgstmultifile.so")
+                self.path("libgstmultipart.so")
+                self.path("libgstogg.so")
+                self.path("libgstossaudio.so")
+                self.path("libgstplaybin.so")
+                self.path("libgstqtdemux.so")
+                self.path("libgstqueue2.so")
+                self.path("libgsttcp.so")
+                self.path("libgsttheora.so")
+                self.path("libgsttypefindfunctions.so")
+                self.path("libgstudp.so")
+                self.path("libgstvideoscale.so")
+                self.path("libgstvolume.so")
+                self.path("libgstvorbis.so")
+                self.path("libgstwavparse.so")
+                
+                self.end_prefix("gstreamer-plugins")
+            
             self.end_prefix("lib")
 
             # Vivox runtimes
@@ -687,12 +748,6 @@ class Linux_i686Manifest(LinuxManifest):
             #        self.path("SLVoice")
             #        self.end_prefix()
             
-            if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
-                self.path("libopenal.so.1")
-                self.path("libalut.so")
-            #        self.path("libortp.so")
-            #        self.path("libvivoxsdk.so")
-                self.end_prefix("lib")
 
 class Linux_x86_64Manifest(LinuxManifest):
     def construct(self):