summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstorage.h
AgeCommit message (Collapse)Author
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-11-22SL-16106 LLScopedIncrement crashAndrey Kleshchev
2021-04-29Clean up a merge conflictCallum Prentice
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-11-27SL-14399 Mac build fixAndrey Kleshchev
2020-11-26SL-14399 Enqueue into 'LLViewerAssetStorage::assetRequestCoro' failedAndrey Kleshchev
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-07-30SL-13626 Fix asset storage coroutine shutdownAndrey Kleshchev
2018-02-26Added settings inventory object with subtypeRider Linden
2017-05-01MAINT-7343 - removed unusued coprocedure parameter, changed one coro ↵Brad Payne (Vir Linden)
argument to pass by value
2017-04-28MAINT-7343 - moved asset downloads to use coprocedure pools, which should ↵Brad Payne (Vir Linden)
reduce the size of potential memory spikes
2017-04-26MAINT-7343 - added periodic logging of state of the asset store.Brad Payne (Vir Linden)
2017-03-20MAINT-7195 work (can't repro), removed UDP fetching path, handle more ↵Brad Payne (Vir Linden)
possible timing issues while connecting to region
2017-03-03SL-409 - added tracking for bytes fetched to viewer assets metrics (does not ↵Brad Payne (Vir Linden)
currently work for textures)
2017-02-17SL-409 - more WIP on http fetching path for assets, capture results to LLVFile.Brad Payne (Vir Linden)
2017-02-15SL-409 - WIP on http fetching path for assetsBrad Payne (Vir Linden)
2017-02-13SL-409 - initial cleanup, mostly indentation fixes and removing unused or ↵Brad Payne (Vir Linden)
inaccessible code
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-08-18SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 msRichard Linden
continued conversion to units system made units perform type promotion correctly and preserve type in arithmetic e.g. can now do LLVector3 in units added typedefs for remaining common unit types, including implicits
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2010-11-18ESC-154 ESC-155 ESC-156Monty Brandenberg
Asset fetch requests wrapped to allow for measurements. Asset fetch enqueues, dequeues and completion times recorded to asset stats collector. Texture fetch operations (http and udp) recorded to asset stats collector. Stats collector time vallue switched from F32 to U64 which is the more common type in the viewer. Cross-thread mechanism introduced to communicate region changes and generate global statistics messages. Facility to deliver metrics via Capabilities sketched in but needs additional work. Documentation and diagrams added.
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-04-16For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2009-07-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
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-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-06-25Lost changes to some virtual function overrides.Samantha Patterson
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:32:59 +0000