summaryrefslogtreecommitdiff
path: root/indra/llmessage/llassetstorage.cpp
AgeCommit message (Expand)Author
2016-03-17MergeRider Linden
2016-02-10MAINT-6066 crash in LLTransferSource::getID()andreykproductengine
2016-01-20MAINT-6066 crash in LLTransferSource::getID()andreykproductengine
2015-09-11Bit of cleanup around Translation and remove httpassetstorageRider Linden
2015-08-25MergeRider Linden
2015-08-18MAINT-5506: Fix ugly timing bug in llurlentry static initialization.Nat Goodspeed
2015-07-30MAINT-5430 Crash LLAssetStorage::downloadCompleteCallbackandreykproductengine
2015-07-30MAINT-5430 Crash LLAssetStorage::downloadCompleteCallbackandreykproductengine
2013-10-25trivial: fix several weird compiling errors.Xiaohong Bao
2013-08-18SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 msRichard Linden
2013-08-16SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 msRichard Linden
2013-08-09second phase summer cleaningRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-06renamed LLTrace stat gathering classes/methods to make the structure of LLTra...Richard Linden
2012-10-15SH-3405 WIP convert existing stats to lltrace systemRichard Linden
2011-09-28SH-2276 Remove some log spam to alleviate stalls on login.Dave Parks
2011-05-02mergeDave Parks
2011-04-22STORM-380 FIXED Added syncing animations and sounds before the gesture starts...Seth ProductEngine
2010-12-21Automated merge up from viewer-developmentLoren Shih
2010-12-10ESC-228 ESC-227 Corrections for metrics counters and send-on-quit delivery.Monty Brandenberg
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-07Merge with render-pipelineDave Parks
2010-05-24Static VFS cache tracingBrad Payne (Vir Linden)
2010-04-21merge from viewer-trunkTofu Linden
2010-04-20CID-462Tofu Linden
2010-04-20slightly hairy merge from viewer-trunkTofu Linden
2010-04-19For EXT-6809 - fixes suggested by Nyx code reviewBrad Payne (Vir Linden)
2010-04-19mergeBrad Payne (Vir Linden)
2010-04-19For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-16For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-16For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-01another hairy merge from viewer-trunkTofu Linden
2010-03-31asset request logging for DEV-47362 investigation.Brad Payne (Vir Linden)
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-25svn merge -r90394:90492 svn/branches/havok4/qar-689 --> releaseDave Simmons
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-02-13svn merge -r 79828:79862 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merg...Josh Bell
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-10-04Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-ex...Aaron Brashears
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze