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

Age	Commit message (Collapse)	Author
2007-07-20	svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-02	svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-06-21	merge -r62831:64079 branches/maintenance to release	Kelly Washington

2007-06-17	svn merge -r 63833:63894 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-17-0 --> release Pick up patches committed to 1.17: * Commented out metrics code that seems to be causing a crash. * Adding metrics to deployed code. added missing __hash__ function to lluuid.py, which fixes using uuid's as keys in maps * Reverting fix for SL-25905; probably cause of script-vieweing exploit on agni. * Removed deploy key checks from farm
2007-06-13	result of merge manually performed through diff and patch. svn diff ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 \| patch -p0 in release
2007-05-30	merge -r61423:62602 svn/branches/maintenance --> release	Kelly Washington

2007-05-08	svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-05-02	svn merge -r 60342:61148 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-21	svn merge -r 59178:59364 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-20	svn merge -r59459:59476 ↵	Karen Clark
	svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/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-03-05	svn merge -r 58117:58118 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate (into release) Port of fix for SL-35327 which was fixed in release-candidate.
2007-03-02	merge release@58699 beta-1-14-0@58707 -> release	Steven Bennetts

2007-02-15	merge -r 57761:57967 im-email-session-3, removes database load from IM to ↵	James Cook
	email session tracking, introduces new format for email return addresses
2007-02-02	Result of svn merge -r57264:57370 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-24	merge -r 56696:57082 Branch_1-13-2	Steven Bennetts

2007-01-04	Result of svn merge -r56461:56474 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/llscene-shuffle into release.
2007-01-02	Print done when done.	James Cook