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

Age	Commit message (Collapse)	Author
2009-11-06	merge from texture-pipeline	Steve Bennetts

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

2009-11-03	fix the bug that textuer boost level is mixed with boolean numbers.	Xiaohong Bao

2009-09-22	Merging render-pipeline-6-qa-2 into viewer-2	David Parks
	Self reviewed.
2009-09-09	merge -r132032-132812 ↵	Richard Nelson
	svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-07-10	merge QAR-1579: texture-cleanup-1.	Xiaohong Bao

2009-07-07	Fix Linux build - failing due to warning about S32/float conversion	James Cook

2009-07-06	fix for DEV-34094: texture console stats are obscured by the loading textures	Xiaohong Bao

2009-06-21	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	Steven Bennetts
	ignore-dead-branch
2009-03-13	svn merge -r114093:114412 ↵	Christian Goetze
	svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-02-03	svn merge -r107016:108767 ↵	Mark Palange
	svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227
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-11-21	Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. ↵	Mark Palange
	101837 to 103519
2008-11-07	QAR-992 Merging revisions 101012-101170,101686-101687 of ↵	Mark Palange
	svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
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-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
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-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
2008-02-19	merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵	Steven Bennetts
	79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191
2007-12-19	svn merge -r 75354:76103 ↵	Jon Wolk
	svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
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-07-02	svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-03-31	svn merge -r 59364:59813 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-21	svn merge -r 59178:59364 ↵	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