viewer.git - Megapahit's fork of the Second Life viewer.

Age	Commit message (Collapse)	Author
2013-05-09	Merge	simon

2013-05-09	Merge downstream code and viewer-beta	simon

2013-05-07	Optimization -- don't draw glow in alpha pool unless needed	Dave Parks

2013-03-29	Update Mac and Windows breakpad builds to latest	Graham Madarasz

2013-03-13	MAINT-2410 Extra Particle Parameters -- viewer implementation	Dave Parks
	Reviewed by Kelly and Graham
2012-07-20	MAINT-570 Remove unused memory tracking system LLMemType	Dave Parks

2010-08-13	Change license from GPL to LGPL (version 2.1)	Oz Linden

2009-09-22	Merging render-pipeline-6-qa-2 into viewer-2	David Parks
	Self reviewed.
2009-07-10	merge QAR-1579: texture-cleanup-1.	Xiaohong Bao

2009-02-18	Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵	Brad Kittenbrink
	(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-01-08	Result of svn merge -r107256:107258 ↵	Aaron Brashears
	svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-11-07	QAR-992 Merging revisions 101012-101170,101686-101687 of ↵	Mark Palange
	svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-08-12	QAR-767 Combined maint-render-7 and maint-viewer-9 merge	Steven Bennetts
	merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-04-30	svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 ↵	James Cook
	maint-ui-11-qa).
2008-04-03	1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426	Steven Bennetts
	QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
2008-03-25	merge release@82858 maint-render-2-merge@83010 -> release	Steven Bennetts
	QAR-389
2008-02-27	Merge of windlight into release (QAR-286). This includes all changes in	Brad Kittenbrink
	windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2007-10-04	Result of svn merge -r71162:71205 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-09-14	EFFECTIVE MERGE: svn merge -r 68118:68999 ↵	Don Kjer
	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-07-18	svn merge -r64837:65485 ↵	Bryan O'Sullivan
	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-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

2007-06-04	svn merge -r 62602:62831 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-05-30	merge -r61423:62602 svn/branches/maintenance --> release	Kelly Washington

2007-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-01-18	Result of svn merge -r56700:56797 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/more-random into release.
2007-01-02	Print done when done.	James Cook