summaryrefslogtreecommitdiff
path: root/indra/llmessage/lltransfermanager.cpp
AgeCommit message (Expand)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-02-04merge from viewer2.Tofu Linden
2010-02-03CID-279Tofu Linden
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-27CID-110Tofu Linden
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/...Don Kjer
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-02-20svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-03corrected, removed, and updated comments throughout the code to be more usefu...Aaron Brashears
2007-01-02Print done when done.James Cook