summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluri.cpp
AgeCommit message (Collapse)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-02-25automated merge from trunkRoxie Linden
2010-01-27CID-220Tofu Linden
Checker: STREAM_FORMAT_STATE Function: encode_character(std::basic_ostream<char, std::char_traits<char>>&, char) File: /indra/llcommon/lluri.cpp
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
merge -r119443 - basic slurl handling ignore dead branch
2009-05-18Result of svn merge -r119432:120464 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-19Fixing tut related compile errors on etch:Andrew Meadows
(1) the LLLand class had to be forward declared in a cpp file that did not include llland.h (2) ensure_equals(const char*, type, type) requires that type have an operator!=(type, type) defined. (3) ensure_equals(const char*, type, type) is so overloaded that the compiler can have trouble picking the right version when it has to implicitly cast a std::string to "const char*" AND multiple valid casts exist for type --> S32, F32, etc. To solve this problem we must explicitly pass in a "const char*" instead of a std::string. Reviewed with CG
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2007-12-29D'oh, try compiling before committing. (If it's any justification, CG was ↵Josh Bell
compiling so I could run home...)
2007-12-29svn merge -r 76642:76643 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640 Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-28svn merge -r 76394:76651 ↵James Cook
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer to pick up LLURI escaping fix and all other changes since last sync. Not reviewed.
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
auth merge
2007-11-15svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6Tess Chu
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-08-02Result of svn merge -r67150:67159 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/mp-backbone-2 into release.
2007-08-01Result of svn merge -r66742:66741 svn+ssh://svn/svn/linden/release in ↵Aaron Brashears
release to revert revision 66742 which was a merge from mp-backbone.
2007-07-30Result of svn merge -r66103:66418 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/mp-backbone into release
2007-07-18svn merge -r63705:65463 svn+ssh://svn/svn/linden/branches/dpo-3-bug-fixKartic Krishnamurthy
NOTE: r63705 is *not* the earliest rev# for dpo-3-bug-fix.
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 ↵Don Kjer
release
2007-05-01svn merge -r 61099:61168 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-03-16merge -r58842:59035 branches/loadstone-names to releaseKelly Washington
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-03-09svn merge -r 58902:58986 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 10:32:59 +0000