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

Age	Commit message (Collapse)	Author
2010-10-13	correct licenses (fix problem with license change merge)	Oz Linden

2010-04-19	For EXT-6809 - fixes suggested by Nyx code review	Brad Payne (Vir Linden)

2010-04-16	For EXT-6809 - search static VFS for all asset types	Brad Payne (Vir Linden)

2010-04-16	For EXT-6809 - search static VFS for all asset types	Brad Payne (Vir Linden)

2009-11-06	merge QAR-1829: texture pipeline branch in viewer-2.0.0.3	Xiaohong Bao

2009-07-16	Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.	Mark Palange
	merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v
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-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
2008-06-25	svn merge -r90394:90492 svn/branches/havok4/qar-689 --> release	Dave Simmons
	QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
2008-02-13	svn merge -r 79828:79862 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-02-12 --> release QAR-280 - combo merge of: * QAR-249 Allow specifying max http protocol version in eventlet.httpd, and change backbone.py to specify HTTP/1.0 explicitly * QAR-272 Switch logout/disconnect messages to syslog/streambase * QAR-253 Test for the group names fix * QAR-260 metrics-3 for release merge
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-06-22	svn merge -r 63401:63939 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/derez-asset-loss-1 --> release NOTE: Skipped whitespace-only changes
2007-05-02	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-03-15	svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into ↵	Don Kjer
	release
2007-01-17	merge release@56803 release-candidate@56833	Steven Bennetts

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