b24e5056e0
Do not tweak LD_PRELOAD or LD_LIBRARY_PATH unless we have to.
2014-06-07 00:50:16 +02:00
7bc14a113e
Test for existance and execution rights before tryin g to register second life and hop protocol.
2014-06-04 18:35:24 +02:00
7889dbc9e2
Don't display 32-bit compatibility messages for 64-bit builds.
2014-04-06 22:23:07 -04:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
316f1fd026
CHOP-957: Stop reading gridargs.dat in 'secondlife' wrapper script.
...
However, for backwards compatibility, continue to recognize and discard
--skip-gridargs switch.
2013-06-25 17:08:16 -04:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
a05afe036c
Removed small typo in linux wrapper script
2013-02-04 10:07:06 -05:00
bc161b040a
Remove FMOD 3.75 leftovers
2013-02-04 08:21:19 -05:00
ba3e89b5c7
first push - patch from CmdCupCake plus force FMODEX on
2013-01-18 16:43:19 -08:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
7d173dffa9
Automated merge
2012-12-14 22:20:35 +00:00
f9b235adf8
Attempt at fixing linux shader support on ubuntu 12.04
2012-12-14 01:24:32 +00:00
d7e90f4160
derive version number from indra/VIEWER_VERSION.txt
2013-02-07 11:56:57 -05:00
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
ceea332a9c
Change old style comments <ND> to <FS:ND> to avoid any future confusion/
2012-12-16 05:19:32 +01:00
f0e34ebcd6
Adding --skip-gridargs argument to secondlife wrapper script on linux.
2012-07-11 23:58:11 +00:00
51018f38a2
IQA-463: fix Linux wrapper.sh (aka secondlife) gridargs.dat handling.
...
Previous change to wrapper.sh naively read $(<etc/gridargs.dat) directly into
the viewer binary command line. But gridargs.dat contains quoted args as well
as simple space-separated ones: need bash to scan the file using eval. This
was why the older logic used eval on the entire command line. However, we must
use eval only for gridargs.dat so we don't lose individual quoting on
arguments passed to the secondlife script.
2012-03-29 09:53:53 -04:00
9d9ad9a876
Tighten Linux treatment of command-line args to 'secondlife' script.
...
New --leap switch takes a quoted command line likely to contain spaces. Sloppy
handling of quoted arguments definitely gets us into trouble. Fix that.
2012-03-20 14:23:00 -04:00
35c46be1db
Linux merge regression: "do-not-directly-run-secondlife-bin not found"
2012-06-23 11:44:43 +02:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
4311d5eaca
SH-1371 tcmalloc comes with the viewer now, don't look for it in /usr/lib
2011-04-25 20:43:49 -05:00
8923afb64f
Force using of LLs prebuild ssl libs. This is necesary or webit will use the system versions. Linux only.
2011-10-30 19:49:42 +01:00
e19e95e55f
FIRE-3459: Support for multi-grid hop:// protocol, by ArminW
2011-10-28 18:09:14 -04:00
b295b257a1
TCMalloc linux tuning, suggested by Henri Beauchamp, experimental
2011-10-02 18:23:15 -04:00
458f4ebb03
FIRE-3254, FIRE-3267, Initial Branding of Linux system install, don't register w/desktop by default.
2011-09-28 22:35:34 -04:00
8d9fba43b9
Firestorm merge catchup
2011-08-27 06:00:46 -04:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
0f0a01bd3c
FIRE-2743, Fix linux command line processing
2011-08-20 10:58:50 -04:00
14014a1dc1
FIRE-1031, adjustments to linux start script to allow easier parsing on command line args.
2011-08-15 11:09:24 -04:00
b19cb69156
Linux branding + documentation, part 1
2010-10-21 18:02:18 -07:00
b19212bb54
Linux viewer - remove some jumping-through-flaming-hoops from the launcher script.
...
This was previously nerfing some (only) 64-bit Linux features in media, and now that media is done out-of-process we don't need to worry about it crashing the main viewer in the worst case.
2010-03-01 22:18:21 +00:00
e66fc02224
Remove reference to mozilla in the linux viewer launch-script.
2009-11-13 15:53:17 +00:00
c3cbd04985
svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6
...
QAR-1771 Linux Viewer Autoupdater + XUI-parse refactoring
2009-08-21 21:52:21 +00:00
7573288ab3
svn merge -r113780:113785
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732
QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST
improvements - combo merge
2009-03-09 23:42:07 +00:00
fd46865a50
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
...
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
ed386ae547
merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
...
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
* gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
* featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
* snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)
Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry
* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
2008-07-18 17:50:25 +00:00
5c51ae5a7b
svn merge -r 85582:85586 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge
...
QAR-500 maint-viewer-5 merge
2008-04-24 18:38:17 +00:00
6fcf38217e
merge release@82858 maint-render-2-merge@83010 -> release
...
QAR-389
2008-03-25 22:50:26 +00:00
42bc4ba02a
merge Branch_1-19-0-Viewer -r 80279 : 80947 -> release
2008-02-28 01:12:38 +00:00
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
b302f15dee
EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release
...
ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release
2008-02-01 02:23:35 +00:00
3cb5c6864e
QAR-211: Logical merge of:
...
svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573
svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes
svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix
svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods
plus addition to MANIFEST for revoke-gods
Actual merge:
svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a
* QAR-177 Linux Voice Support Merge BuildMe
* QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions)
* QAR-194 simcrash-economy-fix
* QAR-201 Revoke gods added to deploy
2008-01-17 23:29:26 +00:00
b01d567a5d
EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
...
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
2007-12-07 20:27:13 +00:00
2f6c760624
svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7
2007-11-20 02:53:43 +00:00
813b140d07
svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge
2007-11-15 22:39:12 +00:00
291d99bc66
svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6
2007-11-15 19:22:19 +00:00
788c18c00d
Merge maint-viewer @ r71064
2007-10-11 19:43:20 +00:00
Nicky