summaryrefslogtreecommitdiff
path: root/indra/llmessage/llurlrequest.h
AgeCommit message (Collapse)Author
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-28EXT-7498 WIP Snapshot SharingAimee Linden
Reviewed by Tofu.
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2009-07-09DEV-34822Roxanne Skelly
svn merge -c120157 svn+ssh://svn.lindenlab.com/svn/linden/branches/giab-viewer/giab-viewer-2
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
QAR-1654 merge completed.
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-02-06svn merge -r 108748:109731 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Merge server 1.25 back to trunk Conflicts: C indra/llcommon/llversionserver.h : svn reverted C indra/tools/bill/MoneyMachine.pm : one conflict, only difference was a blank line. C indra/newsim/lllslmanager.cpp : kept merge-right, in consultation C indra/newsim/lllslmanager.h : with babbage C indra/newsim/llagentinfo.cpp : (runNested, not runSpecial) C indra/test/test_entity_query.py : Kept merge-right C indra/test/test_agent_linden_dollar.py : Kept merge-right --> Kartic fixed these testes in server-1.25 C indra/test/template/httpd.tmpl : Kept merge-right (the IfModule version)
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-08-26merge -r94900 linden/branches/kelly/qar-825 to linden/releaseKelly Washington
QAR-825 DEV-18489 Event poll is brittle and doesn't parse status correctly
2008-05-13svn merge -r 87164:87466 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release Land store (already deployed to agni as 1.21 patches) * Increased the available purchase area in the land store. * Modified select pool query to take a simulator status. Now generating a new uuid for each insert into the fulfill lock table. * Checking to make sure put-simstate returns a uuid region_id. Other stuff (going out soon or already out) * svn merge -r87339 svn/linden/branches/havok4/havok4-6 (Block creation of mega prims.) * Fix for the mega prim fix to also block 0 scale prims. * svn merge -r 84565:86084 svn+ssh://svn.lindenlab.com/svn/linden/branches/single-ref-attach-again --> Branch_1-21-Server (Slipstream QAR-518 single ref attachments) * Switched off indra.known_address in favor of indra_aux.known_address * DEV-15151 check_group_land.py kills the database * DEV-14662 - Change the current model of PREPARE/EXECUTE to directly execute the SQL (QAR-580) * DEV-15167 Random failure with set-classified-stats The secret word is: dataserver-is-deprecated
2008-03-03svn merge -r81155:81167 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8000-merge-0 Allow for a seperate HTTP proxy for the LLHTTPRequest HTTP client (QAR-318)
2008-02-29svn merge -r 81153:81152 .Bryan O'Sullivan
(Undo of previous merge)
2008-02-29svn merge -r80434:80633 svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8000Bryan O'Sullivan
2008-02-28svn merge -r 80357:80990 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release Merge patches from 1.19.1 Server branch: * QAR-293 Fix for hardcoded TTLs in web dataservices * DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size * Bounce apache2 processes before starting backbone/dataserver/simulator * Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61. * Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak * Fixed minor, non user facing bug in multiagentchat * set-classified-stats: Rewrote to use new MDB2 query reformatting syntax * Fixed possible bad conversion of vivox data * DEV-550, caching changes to DirClassifieds Query * QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend * More mem leak fixes for multiagent-chat * QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP * DEV-10151: Sometimes group IMs appear to be person to person IMs * QAR-321 Changes to crash_reporter * DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars * DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY). Web service version of this, must use two named queries because we need to change the query based on input string length.
2007-12-21svn merge -r74200:76302 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-01 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9aChristian Goetze
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-08svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1Kartic Krishnamurthy
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 02:17:49 +0000