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

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

2009-10-03	Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵	James Cook
	tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
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-06-21	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	Steven Bennetts
	ignore-dead-branch
2009-03-20	svn merge -r113004:115000 ↵	Dave Simmons
	svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk
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-06-26	QAR-628 merge string-cleanup-5 -r 90476:90508 -> release	Steven Bennetts
	dataserver-is-deprecated
2008-05-20	svn merge -r87877:87878 ↵	James Cook
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5 which is the last iteration of the maint-ui series of branches. Future work will be in featurettes.
2008-05-09	QAR-565 search-milestone2-merge (more web tabs in search)	Steven Bennetts
	dataserver-is-deprecated
2008-04-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
2007-12-29	svn merge -r 76642:76643 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640 Redo of QAR-170, with correct range. Reviewed by CG.
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-09-19	Passed QA, merging minifriends-3:70006 back to release	Melinda Green

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-01-02	Print done when done.	James Cook