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

Age	Commit message (Collapse)	Author
2009-10-30	fix DEV-41913: parcel media does not display on particle textures.	Xiaohong Bao

2009-08-24	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	Richard Nelson
	DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-07-10	merge QAR-1579: texture-cleanup-1.	Xiaohong Bao

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-06-06	QAR-650 - Viewer RC 9 merge -> release (post cmake)	Steven Bennetts
	merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-04-28	merge release-QAR-499 Viewer 1.20 RC 3	Steven Bennetts
	merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-03	svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release	Kelly Washington
	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-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
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-08-21	EFFECTIVE MERGE: svn merge -r 66133:68118 ↵	Christian Goetze
	svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-07-02	svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

2007-05-30	merge -r61423:62602 svn/branches/maintenance --> release	Kelly Washington

2007-04-03	merge -r 59337:59951 Branch_1-14-0 -> release.	Steven Bennetts

2007-03-09	svn merge -r 58902:58986 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-01-23	merge -r 56842:57026 maintenance.	Steven Bennetts

2007-01-02	Print done when done.	James Cook