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

Age	Commit message (Collapse)	Author
2011-02-01	Automated merge up from viewer-development into mesh-development	Loren Shih

2011-01-28	trivial: convert to "unix return"	Xiaohong Bao

2011-01-26	add "pause" function for SH-846: design and implement the debug code to ↵	Xiaohong Bao
	locate memory leaking
2011-01-26	for SH-846: design and implement the debug code to locate memory leaking	Xiaohong Bao

2010-10-13	correct licenses (fix problem with license change merge)	Oz Linden

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

2010-05-21	Fix up the SSE stuff so it compiles on Linux. Though I don't think it ↵	Tofu Linden
	actually works properly.
2009-06-21	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	Steven Bennetts
	ignore-dead-branch
2009-02-03	QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme	Adam Moss
	svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
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-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-06-27	QAR-669 1.20 Viewer RC11	Steven Bennetts
	QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
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-05-08	QAR-570 maint-render-4 merge	Steven Bennetts
	merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
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-03-31	svn merge -r 59364:59813 ↵	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-02-17	merge -r 56779:58057 /branches/selection_management	Richard Nelson

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