summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
AgeCommit message (Collapse)Author
2022-10-21Merge branch 'master' (DRTVWR-548) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-06-21SL-17635 remove unused variablesMaxim Nikolenko
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-04-15SL-17219 WIP - Texture pipeline overhaulDave Parks
2022-02-11SL-1370 Add more memory logging to mesh repositoryAndrey Kleshchev
2022-01-14SL-16606: Add profiler category NETWORKPtolemy
2022-01-14SL-16606: Add profiler category AVATARPtolemy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-20SL-16289 Rigged mesh rendering overhaulDave Parks
2021-10-14SL-16166 Apply optimizations from pushBatch to other render call sites. ↵Runitai Linden
Optimize out a map lookup in rigged face rendering.
2021-09-14SL-15961 Convert LLMeshRepository::mSkinMap into unordered_map and reduce ↵Runitai Linden
number of per-frame lookups to said map.
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-06-03SL-15272 Bugsplat crashes at condition wait()Andrey Kleshchev
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
2021-04-12Fix for SL-15105 (Mesh/Cache messages are spamming the log) - I don't know ↵Callum Prentice
why the log spam is present when the 'Mesh' tag is missing from logcontrol.xml for LL_INFOS(..) messages so I changed it to LL_DEBUGS(..)
2021-03-26Add some logging for QA purposes (based on INFO/Mesh tag) to display when ↵Callum Prentice
the mesh header and the mesh body is retrieved from the simulator or the local cache.
2021-03-09Ansariel kindly offered their patch to help mitigate this round of file ↵Callum Prentice
system issues - taken from https://vcs.firestormviewer.org/phoenix-firestorm/changeset/104a8600946be01e2de44d10ad069ba854272d1f
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-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.
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-10-26SL-14148 remove redundant zeroing of the fileMnikolenko Productengine
2020-10-06Add in the C++ filesystem based cache and clean up some indempotent ↵Callum Prentice
functions in llfilesystem
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-22Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterconversationpreview.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.h # indra/newview/llvoicevivox.cpp
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
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-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-07-28SL-13634 Don't warn about convex decomposition issues if it's a stubAndrey Kleshchev
2020-05-27Fixed assert on volume unrefAndrey Kleshchev
2020-05-05Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-05-05Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventorypanel.cpp # indra/newview/lltexturectrl.cpp # indra/newview/skins/default/xui/de/floater_texture_ctrl.xml # indra/newview/skins/default/xui/es/floater_texture_ctrl.xml # indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/it/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml # indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml # indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml # indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml # indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-04-27Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-04-07SL-2569 LLSD header of a mesh should be covered by mutexAndrey Kleshchev
2020-03-28Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
2020-02-21mergeBrad Payne (Vir Linden)
2020-02-03SL-2569 More bad alloc checksAndrey Kleshchev
2019-11-15SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. ↵Brad Payne (Vir Linden)
Group-related costs and limits via benefits.
2019-10-23SL-11727 Fix build warningsandreykproductengine
2019-10-15SL-11986 Mesh Uploader does not report Upload cost on fee-failureandreykproductengine
2019-05-28SL-1105 Pack a name for server to useandreykproductengine
2019-03-03SL-10422 Validate meshandreykproductengine
2019-02-22SL-10422 Validate loaded meshandreykproductengine
2019-01-15SL-10291 Replace apr_atomic with standard C++11 functionalityandreykproductengine
2019-01-14SL-10291 Replace apr_mutex with standard C++11 functionalityandreykproductengine
2018-11-29SL-9747 [Mesh Uploader] Remove confusing model_metric from uploadandreykproductengine
2018-11-26SL-10101 Remade most frequent setting calls to cached variantsandreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 17:56:27 +0000