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

Age	Commit message (Collapse)	Author
2009-08-11	Better solution for fixing up the LLFloaterTOS callback after the last ↵	brad kittenbrink
	viewer-2.0.0-3 merge. LLFloaterTOS and LLLoginInstance now communicate through an event pump "lllogininstance_tos_callback". reviewed by Mani.
2009-08-06	Merged in partial rollback of LLFloaterTOS post-merge fixes.	brad kittenbrink

2009-08-06	Backed out changeset bfb246df4655: rolling back LLFloaterTOS post-merge ↵	brad kittenbrink
	fixups because they didn't work on linux.
2009-08-05	Fixups after the latest merge with viewer-2.0.0-3. Updated LLLoginInstance ↵	brad kittenbrink
	to use the new LLFloaterReg way of getting hold of floaters.
2009-08-04	Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs ↵	brad kittenbrink
	some post-merge cleanup.
2009-08-04	svn merge -r 128442:129343 ↵	Richard Nelson
	svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-22	Adding LLLoginInstance unit test	Mark Palange (Mani)

2009-06-21	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	Steven Bennetts
	ignore-dead-branch
2009-05-11	svn merge -r113003:119136 ↵	Nat Goodspeed
	svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
2009-05-08	merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7	Steven Bennetts

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
2009-01-05	svn merge -r106715:HEAD ↵	Kent Quirk
	svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2008-08-13	QAR-782 Merge featurettes batch #2	Steven Bennetts
	merge featurettes-6-merge-2 -> 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-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
2008-02-14	svn merge -r 79730:79944 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
2007-11-07	merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079	Steven Bennetts

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-08-21	EFFECTIVE MERGE: svn merge -r 66133:68118 ↵	Christian Goetze
	svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-05-04	svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-05-01	svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵	Don Kjer
	into release
2007-03-16	merge -r 59028:59178 maintenance -> release.	Steven Bennetts

2007-03-14	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-02-24	svn merge -r 58007:58273 ↵	Richard Nelson
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-10	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 ↵	Jon Wolk
	svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry
2007-01-08	svn merge -r 56431:56560 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-02	Print done when done.	James Cook