summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.h
AgeCommit message (Expand)Author
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
2008-03-14svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-04EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> releaseSteven Bennetts
2007-12-03-74901 (back out premature commit to release)Steven Bennetts
2007-12-03merge -r 73391:74133 maint-ui-3 -> releaseSteven Bennetts
2007-11-09EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-11-01svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-s...Josh Bell
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
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-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-04svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-02Print done when done.James Cook