diff options
author | Jacek Antonelli | 2009-01-27 00:29:45 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-27 00:29:45 -0600 |
commit | c23391afc476cc43f7a055fef4866816fecc1ca4 (patch) | |
tree | e4a51dba68e368587e43392ef8a54a804c950839 | |
parent | Merge commit 'mccabe/1.1.0-RC1' into next (diff) | |
download | meta-impy-c23391afc476cc43f7a055fef4866816fecc1ca4.zip meta-impy-c23391afc476cc43f7a055fef4866816fecc1ca4.tar.gz meta-impy-c23391afc476cc43f7a055fef4866816fecc1ca4.tar.bz2 meta-impy-c23391afc476cc43f7a055fef4866816fecc1ca4.tar.xz |
Set GST_PLUGIN_PATH for Linux.
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rwxr-xr-x | linden/indra/newview/linux_tools/wrapper.sh | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index d77522a..7e0b3d6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -2,6 +2,12 @@ | |||
2 | =- 1.1.0 -= | 2 | =- 1.1.0 -= |
3 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- | 3 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- |
4 | 4 | ||
5 | 2009-01-27 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
6 | |||
7 | * linden/indra/newview/linux_tools/wrapper.sh: | ||
8 | Set GST_PLUGIN_PATH for Linux. | ||
9 | |||
10 | |||
5 | 2009-01-24 McCabe Maxsted <hakushakukun@gmail.com> | 11 | 2009-01-24 McCabe Maxsted <hakushakukun@gmail.com> |
6 | 12 | ||
7 | * linden/indra/newview/llfloaterhtmlhelp.cpp: | 13 | * linden/indra/newview/llfloaterhtmlhelp.cpp: |
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh index e1c68b9..23053d3 100755 --- a/linden/indra/newview/linux_tools/wrapper.sh +++ b/linden/indra/newview/linux_tools/wrapper.sh | |||
@@ -102,6 +102,8 @@ if [ -n "$LL_TCMALLOC" ]; then | |||
102 | fi | 102 | fi |
103 | fi | 103 | fi |
104 | 104 | ||
105 | export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/" | ||
106 | |||
105 | export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' | 107 | export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"' |
106 | export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin' | 108 | export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin' |
107 | export SL_OPT="`cat gridargs.dat` $@" | 109 | export SL_OPT="`cat gridargs.dat` $@" |