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

Age	Commit message (Collapse)	Author
2009-06-21	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	Steven Bennetts
	ignore-dead-branch
2009-04-16	svn merge -r117314:117337	Adam Moss
	svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
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-10-08	merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵	Mark Palange
	fixes) merge to trunk (for real)
2008-10-07	Roll back of r98854 Accidentally commited merge in progress	Mark Palange

2008-10-07	merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security ↵	Mark Palange
	fixes) merge to trunk
2008-08-28	merge viewer/viewer_1-21 94170-94770 -> release	Steven Bennetts
	merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-07-23	svn merge -r92720:92721 ↵	Karl Steifvater
	svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-22	svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> ↵	Josh Bell
	release Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22	merge uv-picking branch.	Karl Steifvater
	svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-06-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
2008-05-19	EFFECTIVE MERGES:	Don Kjer
	svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release dataserver-is-deprecated
2008-05-07	Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 ↵	Brian McGroarty
	svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07	QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 ↵	Brian McGroarty
	svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-04-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
2007-11-07	merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079	Steven Bennetts

2007-10-10	svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3	Christian Goetze

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-11	fix for crash because of recent changes in tool handleSelect() from Richard. ↵	Aaron Brashears
	SL-44935
2007-05-02	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-02-17	merge -r 56779:58057 /branches/selection_management	Richard Nelson

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