summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
AgeCommit message (Expand)Author
2008-07-22merge uv-picking branch.Karl Steifvater
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
2008-04-23QAR-488 Viewer 1.20 RC 2Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
2008-04-17Undid previous commit (bogus merge)Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2007-12-21svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn....Brad Kittenbrink
2007-04-11svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-21svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-03-09svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-07SKIPPED 58849. merge -r 58856:58859 maintenance -> releaseSteven Bennetts
2007-03-07merge -r 58751:58843 maintenance -> releaseSteven Bennetts
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-03corrected, removed, and updated comments throughout the code to be more usefu...Aaron Brashears
2007-01-02Print done when done.James Cook