summaryrefslogtreecommitdiff
path: root/indra/newview/lltooldraganddrop.cpp
AgeCommit message (Expand)Author
2009-07-24svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
2009-01-17svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-23svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-pi...Karl Steifvater
2008-07-22svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> re...Josh Bell
2008-07-22merge uv-picking branch.Karl Steifvater
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-04-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 m...James Cook
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-20DEV-12219 Objects pulled from inventory showing up undergroundKarl Steifvater
2008-03-14svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-03-04svn merge -r 80852:81039 svn+ssh://svn.lindenlab.com/svn/linden/branches/secu...Mark Palange
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/...Don Kjer
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-11-01svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
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-02-24svn merge -r 58007:58273 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Richard Nelson
2007-02-20svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-02-09Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patche...Aaron Brashears
2007-02-05merge -r 57111:57464 maintenance.Steven 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