summaryrefslogtreecommitdiff
path: root/indra/llmessage/llassetstorage.cpp
AgeCommit message (Expand)Author
2010-06-07Merge with render-pipelineDave Parks
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
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
2007-06-22Tweak initializer order to silence a gcc warning (now treated as error)Josh Bell
2007-06-22svn merge -r 63401:63939 svn+ssh://svn.lindenlab.com/svn/linden/branches/dere...Josh Bell
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-03-30Merge of final upload-queue changes from Branch_1-13-4 --> releaseJosh Bell
2007-03-20svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroi...Karen Clark
2007-03-15svn merge -r 58433:58660 svn+ssh://svn/svn/linden/branches/upload-queue into ...Don Kjer
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 07:20:47 +0000