Second Life viewer sources 1.18.1.2

3 files changed, 40 insertions, 8 deletions

diff --git a/linden/indra/newview/linux_tools/client-readme.txt b/linden/indra/newview/linux_tools/client-readme.txt
index 63086c8..e07384c 100644
--- a/linden/indra/newview/linux_tools/client-readme.txt
+++ b/linden/indra/newview/linux_tools/client-readme.txt
@@ -15,6 +15,7 @@ Life itself - please see <http://www.secondlife.com/whatis/>.
    5.3. 'Shiny' and client performance
    5.4. Audio
    5.5. 'Alt' key for camera controls doesn't work
+   5.6. In-world movie playback
 6. Advanced Troubleshooting
    6.1. Audio
    6.2. OpenGL
@@ -57,6 +58,7 @@ Minimum requirements:
     * Video/Graphics Card:
           o nVidia GeForce 2, GeForce 4mx, or better
           o OR ATI Radeon 8500, 9250, or better
+          (nVidia cards are strongly recommended for the Linux client)
 
       **NOTE**: Second Life absolutely requires you to have recent, correctly-
       configured OpenGL 3D drivers for your hardware - the graphics drivers
@@ -76,6 +78,14 @@ unpacked it into - no installation step is required.
 
 Run ./secondlife from the installation directory to start Second Life.
 
+For in-world MOVIE PLAYBACK, you will need GStreamer 0.10 installed on your
+system.  This is optional - it is not required for general client
+functionality.  If you have GStreamer 0.10 installed, the selection of
+in-world movies you can successfully play will depend on the GStreamer
+plugins you have; if you cannot play a certain in-world movie then you are
+probably missing the appropriate GStreamer plugin on your system - you may
+be able to install it (see TROUBLESHOOTING).
+
 User data is stored in the hidden directory ~/.secondlife by default; you may
 override this location with the SECONDLIFE_USER_DIR environment variable if
 you wish.
@@ -93,10 +103,9 @@ the Alpha release of the Linux client.
   stability.  See PROBLEM 3 in the TROUBLESHOOTING section if you wish to
   turn these on to possibly enhance your experience.
 
-* MISC - The following user-visible features are not currently fully
-  implemented on the Linux client and are therefore known not to work properly
-  at this time:
-  * QuickTime movie playback and movie recording
+* MISC - The following features are not currently fully implemented on the
+  Linux client and are therefore known not to work properly:
+  * Movie recording
   * Full Unicode font rendering
   * Auto-updater
 
@@ -176,6 +185,13 @@ SOLUTION:- Some window managers eat the Alt key for their own purposes; you
    example, the 'Windows' key!) which will allow the Alt key to function
    properly with mouse actions in Second Life and other applications.
 
+PROBLEM 6:- In-world movie playback doesn't work for me.
+SOLUTION:- You need to have a working installation of GStreamer 0.10; this
+   is usually an optional package for most versions of Linux.  If you have
+   installed GStreamer 0.10 and you can play some movies but not others then
+   you need to install a wider selection of GStreamer plugins, either
+   from your vendor or an appropriate third party.
+
 
 6. ADVANCED TROUBLESHOOTING
 -=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -219,9 +235,8 @@ For problems and discussion concerning unofficial (not secondlife.com)
 releases, please contact your packager or the SLDev mailing list:
 <https://lists.secondlife.com/cgi-bin/mailman/listinfo/sldev>
 
-In-world help: Please use the 'Help' menu in the client for general
-non-Linux-specific Second Life help including live support from the fabulous
-'Help Request' team.
+In-world help: Please use the 'Help' menu in the client for various
+non-Linux-specific Second Life help options.
 
 In-world discussion: There is a 'Linux Client Users' group
 inside Second Life which is free to join.  You can find it by pressing
diff --git a/linden/indra/newview/linux_tools/unicode.ttf b/linden/indra/newview/linux_tools/unicode.ttf
index c9c230d..91e6150 120000
--- a/linden/indra/newview/linux_tools/unicode.ttf
+++ b/linden/indra/newview/linux_tools/unicode.ttf
@@ -1 +1 @@
-/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
\ No newline at end of file
+/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
\ No newline at end of file
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index d77da88..d39fc3a 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -48,6 +48,23 @@ export SDL_VIDEO_X11_DGAMOUSE=0
 
 RUN_PATH=`dirname "$0" || echo .`
 cd "${RUN_PATH}"
+if [ -n "$LL_TCMALLOC" ]; then
+    tcmalloc_libs='/usr/lib/libtcmalloc.so.0 /usr/lib/libstacktrace.so.0 /lib/libpthread.so.0'
+    all=1
+    for f in $tcmalloc_libs; do
+        if [ ! -f $f ]; then
+            all=0
+        fi
+    done
+    if [ $all != 1 ]; then
+        echo 'Cannot use tcmalloc libraries: components missing' 1>&2
+    else
+        export LD_PRELOAD=$(echo $tcmalloc_libs | tr ' ' :)
+        if [ -z "$HEAPCHECK" -a -z "$HEAPPROFILE" ]; then
+            export HEAPCHECK=${HEAPCHECK:-normal}
+        fi
+    fi
+fi
 LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}" $LL_WRAPPER bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat
 
 echo