summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Expand)Author
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-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-30merge -r61423:62602 svn/branches/maintenance --> releaseKelly Washington
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn....Brad Kittenbrink
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-04-11svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-26Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back ...Josh Bell
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn....Josh Bell
2007-03-07SKIPPED 58849. merge -r 58856:58859 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-24merge -r 56696:57082 Branch_1-13-2Steven Bennetts
2007-01-18merge -r 56738:56842 maintenance.Steven Bennetts
2007-01-04svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn....Josh Bell
2007-01-03corrected, removed, and updated comments throughout the code to be more usefu...Aaron Brashears
2007-01-02Print done when done.James Cook