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

Age	Commit message (Collapse)	Author
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-09-19	Passed QA, merging minifriends-3:70006 back to release	Melinda Green

2007-08-30	Merge sl-search-opt-in back into the release branch	Sam Kolb
	Reviewed by Josh and Don
2007-08-02	Merge down from Branch_1-18-1:	Monroe Williams
	svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-07-18	svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fix	Kartic Krishnamurthy
	NOTE: r63705 is not the earliest rev# for dpo-3-bug-fix.
2007-05-30	merge -r61423:62602 svn/branches/maintenance --> release	Kelly Washington

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-04-11	svn merge -r 59968:60342 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31	svn merge -r 59364:59813 ↵	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-09	svn merge -r 58902:58986 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-02-27	merge -r 58285:58437 maintenance.	Steven Bennetts

2007-02-05	merge -r 57111:57464 maintenance.	Steven Bennetts

2007-02-02	svn merge -r 57502:57551 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 svn merge -r 57565:57604 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3 (skips 57565, a merge from release. being picky.) Pick up fixes for: * Offer Teleport in profiles * Setting 'none' group * agni_check_parcel_auctions exception (pushed live already)
2007-02-02	Result of svn merge -r57264:57370 ↵	Aaron Brashears
	svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-31	merge release@57486 release-candidate@57503	Steven Bennetts

2007-01-23	svn merge -r 57026:57058 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-08	svn merge -r 56431:56560 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
2007-01-04	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui// (from maintenance r55380) - XML processing instruction went AWOL
2007-01-03	corrected, removed, and updated comments throughout the code to be more ↵	Aaron Brashears
	useful. no code changes. SL-13762
2007-01-02	Print done when done.	James Cook