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-02-04	merge from viewer2.	Tofu Linden

2010-02-03	CID-279	Tofu Linden
	Checker: UNINIT_CTOR Function: LLTransferTarget::LLTransferTarget(e_transfer_target_type, const LLUUID &, e_transfer_source_type) File: /indra/llmessage/lltransfermanager.cpp
2010-01-28	Merge from viewer2 trunk.	Tofu Linden

2010-01-27	CID-110	Tofu Linden
	Checker: MISSING_BREAK Function: LLTransferSourceChannel::updateTransfers() File: /indra/llmessage/lltransfermanager.cpp not a bug, commented.
2009-11-02	Sync up with render-pipeline-7 ignore-dead-branch	David Parks

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-05-11	QAR-566 maint-viewer-5-merge-2	Steven Bennetts
	Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2007-12-05	EFFECTIVE MERGE: svn merge -r 71520:73420 ↵	Don Kjer
	svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
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-07-11	svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 ↵	Tess Chu
	svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-05-02	svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-02-20	svn merge -r 57620:58007 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-02-02	Result of svn merge -r57264:57370 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-17	merge release@56803 release-candidate@56833	Steven Bennetts

2007-01-03	corrected, removed, and updated comments throughout the code to be more ↵	Aaron Brashears
	useful. no code changes. SL-13762
2007-01-02	Print done when done.	James Cook