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

Age	Commit message (Collapse)	Author
2010-08-27	Post-convert merge by convert_monolith.py from ./viewer-experience	Monroe Linden

2010-08-16	moved buildFloater out of lluictrlfactory to llfloater.cpp	Richard Nelson

2010-08-24	Backed out changeset c3d41f18ce2b	Tofu Linden
	back-out the back-out for this branch. yay.
2010-08-24	Backed out changeset a62bf7c0af21	Tofu Linden
	Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24	merge heads. whew.	Tofu Linden

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

2010-07-30	deprecated LLPanel::child*() methods	Richard Nelson

2010-01-14	EXT-3795 First run messages still display (click & drag on map, Build tools ↵	angela
	open, movement controlled, etc)
2009-09-22	Merging render-pipeline-6-qa-2 into viewer-2	David Parks
	Self reviewed.
2009-08-24	merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3	Richard Nelson
	DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-07-06	Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵	James Cook
	UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-06-21	merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3	Steven Bennetts

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-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-04-03	svn merge -r 83778:83944 maint-ui-10-merge	James Cook
	QAR-442
2008-04-01	merge release@83343 skinning-1-merge@83714 -> release	Steven Bennetts
	QAR-424
2008-03-20	merge release@82383 viewer-cleanup2-7-merge@82828	Steven Bennetts
	QAR-369
2008-03-15	reverting premature commit at 82410.	Steven Bennetts

2008-03-14	[NOTE: This was an erroneous commit, and was reverted in the next revision]	Mark Palange
	QAR-369 - viewer-cleanup2-7 81916 merged into release.