livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,599 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

52 Commits (bea2dfbc22bb2d80755dcf9daf810e1ea0329c2d)

Author SHA1 Message Date
Dave Parks 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
Tofu Linden 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
Tofu Linden 2a9232d307 another minor readme tweak. 2010-02-22 16:27:05 +00:00
Tofu Linden 4ad449d74d Update Linux viewer README to cover basic Flash requirements. 2010-02-22 16:25:30 +00:00
Tofu Linden 6fde9c8fdb DEV-39784 SNOW-218: KDE 4 applications don't recognize secondlife:// urls 
patch by thickbrick sleaford, reviewed by me (tofu linden)
 2009-12-23 16:40:24 -08:00
Tofu Linden c9ea0f5097 Slightly update the linux README. 2009-12-16 15:24:36 -08:00
Tofu Linden 8a6ba9dd66 Add a note about 'Voice Echo Canyon' to the linux voice readme. 2009-12-16 14:43:20 -08:00
Tofu Linden 63983ea3bc Linux voice 'readme' update. 2009-12-16 14:41:25 -08:00
Tofu Linden e66fc02224 Remove reference to mozilla in the linux viewer launch-script. 2009-11-13 15:53:17 +00:00
Adam Moss 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
Adam Moss 9dfe0ca9a0 svn merge -r121194:121210 
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
 2009-05-22 09:58:47 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
 2009-04-16 23:45:35 +00:00
Adam Moss 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
Mark Palange 33250359f3 QAR-1262 Merging non-voice related Viewer 1.22 RC 9 changes back to trunk. 
svn merge -r109446-109676 -r109832-109921 -r109956 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.22
 2009-02-24 20:12:41 +00:00
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
 2009-02-03 17:56:26 +00:00
Adam Moss 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
Adam Moss a879e13055 svn merge -c102054 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015

QAR-1016 joystick+spacenav improvements MERGE
 2008-11-12 20:28:24 +00:00
James Cook 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
Josh Bell 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
Steven Bennetts 3901894708 QAR-488 Viewer 1.20 RC 2 
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
 2008-04-23 01:04:01 +00:00
Adam Moss 669d1162f4 QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe 
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84983
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/fontconfig-merge1
 2008-04-17 14:56:00 +00:00
Kelly Washington dc48f1c741 svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release 
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.

QAR-448
 2008-04-03 22:50:22 +00:00
Steven Bennetts 6fcf38217e merge release@82858 maint-render-2-merge@83010 -> release 
QAR-389
 2008-03-25 22:50:26 +00:00
Josh Bell 133a7b5fe2 svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release 
QAR-364 - merge of maint-ui-9
 2008-03-14 19:27:38 +00:00
Steven Bennetts 42bc4ba02a merge Branch_1-19-0-Viewer -r 80279 : 80947 -> release 2008-02-28 01:12:38 +00:00
Brad Kittenbrink 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
Adam Moss 6027ad2630 QAR-279 Improved Voice volume management & Linux Voice 
Featuring:
 DEV-9505   Working device enumeration A.K.A. USB headset support
 DEV-9727 Linux Voice quality issues in 1.19.0
 DEV-10802 Change the way local output volume is handled
 And Vivox SDK updates all-round.

svn merge -c80652 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-279 .
 2008-02-26 18:28:52 +00:00
Steven Bennetts 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
Josh Bell 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
Steven Bennetts 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
Tess Chu 2f6c760624 svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7 2007-11-20 02:53:43 +00:00
Tess Chu 813b140d07 svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge 2007-11-15 22:39:12 +00:00
Tess Chu 291d99bc66 svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6 2007-11-15 19:22:19 +00:00
Brian McGroarty 788c18c00d Merge maint-viewer @ r71064 2007-10-11 19:43:20 +00:00
Don Kjer b089fc559a EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release 
** This should be the last merge from branches/maintenance.  All future merges will be from new maintenance-# branches off release **

ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
 2007-09-28 23:32:53 +00:00
Don Kjer 13c391f198 EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance 
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
 2007-09-14 21:13:20 +00:00
Josh Bell b3d807d5ff svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release 
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
 2007-09-13 18:17:52 +00:00
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release 
Actual action: branched maintenance-r68118, merged in release, then copied result into release
 2007-08-21 22:17:53 +00:00
Don Kjer 9746cf5310 EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release 
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392

ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
 2007-07-26 01:22:23 +00:00
Bryan O'Sullivan ce7682c2a4 svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 
(only inside indra)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
 2007-07-18 21:22:40 +00:00
Adam Moss a994cc3775 SL-24190 'Streaming video support for Linux' 
QA'd.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@65172
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-24190i-based-on-r65172
 2007-07-16 19:20:06 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Josh Bell e61a10ec5b svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-06-04 18:46:59 +00:00
Don Kjer 1c909afe39 svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
Adam Moss 208ccf8c2c SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567, 
SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource
fixes.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 ->
release
 2007-04-18 09:17:53 +00:00
Josh Bell 0277259455 svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-11 17:54:18 +00:00
Steven Bennetts 5e9e67cb2d merge -r 59028:59178 maintenance -> release. 2007-03-16 20:39:40 +00:00
Josh Bell 6fa974fc64 svn merge -r 58859:58902 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-08 00:25:12 +00:00
Steven Bennetts 4dabd9c047 merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
Adam Moss dbcc89b336 Small update to the linux client readme to remove the lack of mozilla 
embedding from 'known issues'.
 2007-02-13 09:49:41 +00:00