summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluri.cpp
AgeCommit message (Expand)Author
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-02-25automated merge from trunkRoxie Linden
2010-01-27CID-220Tofu Linden
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-19Fixing tut related compile errors on etch:Andrew Meadows
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2007-12-29D'oh, try compiling before committing. (If it's any justification, CG was com...Josh Bell
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-28svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...James Cook
2007-11-20svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7Tess Chu
2007-11-15svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer ...Tess Chu
2007-11-15svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6Tess Chu
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-02Result of svn merge -r67150:67159 svn+ssh://svn/svn/linden/branches/mp-backbo...Aaron Brashears
2007-08-01Result of svn merge -r66742:66741 svn+ssh://svn/svn/linden/release in release...Aaron Brashears
2007-07-30Result of svn merge -r66103:66418 svn+ssh://svn/svn/linden/branches/mp-backbo...Aaron Brashears
2007-07-18svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fixKartic Krishnamurthy
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-01svn merge -r 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-03-16merge -r58842:59035 branches/loadstone-names to releaseKelly Washington
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn....Josh Bell
2007-03-09svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-05merge r58577:58578 Branch_1-13-3 to releaseKelly Washington
2007-01-31merge release@57486 release-candidate@57503Steven Bennetts
2007-01-02Print done when done.James Cook