Commit Graph

369 Commits (1b0e3d68183fb63ac5c160bc9aa7956746f33faf)

Author SHA1 Message Date
Dave Houlton 303feae305 Merge branch 'master' v6.4.17 into DRTVWR-525 2021-03-10 09:34:16 -07:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
2021-03-08 13:56:16 +00:00
Dave Houlton 363bc9d9d0 Merge branch 'master' v 6.4.15 into DRTVWR-525 2021-03-02 14:25:36 -07:00
Callum Prentice d26567915c Merge with Master after Viewer release 2021-02-03 09:31:32 -08:00
Dave Houlton f07b332ef0 Merge branch 'master' into DV525-merge-6.4.13 2021-02-01 15:59:08 -07:00
Dave Houlton 21e2f3e974 Merge branch 'master' 6.4.12 into DRTVWR-510 2020-11-11 15:43:06 -07:00
Callum Prentice 9b1d9150c2 Merge branch 'master' into DRTVWR-519 2020-11-11 13:22:35 -08:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
Andrey Kleshchev ad6b1b0b7c SL-14150 Fix spelling 2020-10-23 09:58:17 +03:00
Andrey Kleshchev 0bf11e45ea SL-14150 Handle more cases of corrupted cache 2020-10-22 22:22:17 +03:00
Dave Houlton d12305496f DRTVWR-510 clean up obsolete downstream-from-mDebugGPU code 2020-10-19 17:21:56 -06:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Callum Prentice 2e6f516411 Renamed the references to LLVFile and llvfile.* source code plus cmake 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-16 21:12:53 -07:00
Callum Prentice 3fc07dea01 First part of change to remove LLVFS from the Viewer. Consists of code 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-09-16 18:53:24 -07:00
Andrey Kleshchev 2938b8238c SL-12889 Failed to cache image crashes 2020-05-25 23:59:56 +03:00
maxim_productengine edb4373f7d SL-9775 FIXED EEP viewer crash when looking at the sun (which is playing parcel media) 2020-03-05 14:13:39 +02:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
Brad Payne (Vir Linden) c7747d2a1b merge 2019-10-16 22:24:03 +01:00
andreykproductengine af5c556270 Merge from viewer-release 2019-10-15 21:28:37 +03:00
Graham Linden 3609eabe54 Merge viewer-release 6.3.2 2019-09-10 12:07:01 -07:00
andreykproductengine 37eb735ba7 Merged in lindenlab/viewer-release 2019-09-10 20:30:25 +03:00
andreykproductengine 8369276a49 DRTVWR-493 LLViewerMedia to singleton 2019-06-21 20:55:39 +03:00
andreykproductengine 3dd074d5ec SL-11338 Better logging for missing texture reference 2019-05-31 21:56:58 +03:00
Graham Linden 605c9c1966 Fix merge fail. 2019-05-08 11:42:31 -07:00
AndreyL ProductEngine 1470e82c89 Merged in lindenlab/viewer-release 2019-04-02 21:51:54 +03:00
AndreyL ProductEngine 74a56f30aa Merged in lindenlab/viewer-release 2018-12-14 00:46:11 +02:00
AndreyL ProductEngine df497ee700 Merged in lindenlab/viewer-lynx 2018-11-22 18:33:19 +02:00
andreykproductengine 59d57c438e MAINT-8977 Only affect large LOD textures 2018-11-22 14:38:33 +02:00
andreykproductengine dea5450d78 SL-4730 Prevent viewer from getting more texture details when low on memory 2018-11-20 19:47:00 +02:00
maxim_productengine f8106e9f3f SL-9991 FIXED Crash in LLViewerLODTexture::processTextureStats() 2018-11-05 17:52:45 +02:00
AndreyL ProductEngine 892d3a9bf8 Merged in lindenlab/viewer-release 2018-09-27 13:04:12 +03:00
andreykproductengine ae1e9ca0a4 MAINT-8977 32bit viewer should have stricter image size cap 2018-08-20 16:43:54 +03:00
maxim_productengine a6cc3b7159 SL-11074 FIXED "Cache Hit Rate" in Statistics is broken 2019-05-06 17:14:55 +03:00
AndreyL ProductEngine 65bf63c973 Merged in lindenlab/viewer-bear 2019-04-02 22:12:55 +03:00
Graham Linden graham@lindenlab.com c0413250b7 Merge 5.1.5 2018-05-18 19:25:54 +01:00
Graham Linden graham@lindenlab.com c0e16b2800 Add stats for tex cache read / decode / fetch latency for comparison of old cache code with TCO. 2018-04-11 20:14:33 +01:00
Andrey Kleshchev 4156fb832c MAINT-6363 Normal and specular maps should not be downloaded if ALM is off 2018-03-06 12:59:32 +00:00
andreykproductengine d9064d3a4e MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep the selected texture. 2018-02-27 15:49:15 +02:00
AndreyL ProductEngine 2897ea5c5b Backed out changeset: b500f22775dd 2017-12-20 22:03:38 +02:00
AndreyL ProductEngine 9fe126e7e5 Backed out changeset: 761e890970b2 2017-12-20 22:03:06 +02:00
andreykproductengine 9de2af8b2d MAINT-7847 Remake of 'white alpfa' fix 2017-11-13 14:26:15 +02:00
andreykproductengine 83b0467f9f Backed out changeset: 544a91982eba
Originally a fix for MAINT-4773. This was causing a number of issues since
changes made in this code were pushing null textures into server and viewer
should not modify 'content' at server of own violition.
2017-11-10 20:33:51 +02:00
ruslantproductengine 6dcde6469d [SL-711] - Eliminate some overheads in texturecache.
- Eliminate memory overhead when need duplicated scaled image.
- Small improvement in LLImageBase::getCodecFromExtension()
2017-06-06 15:30:03 +03:00
andreykproductengine f8254a9d78 MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows folder. 2017-08-30 19:57:02 +03:00
andreykproductengine 515db9c3e6 MAINT-7325 Fixed empty cached image being used instead of fetching 2017-06-12 20:17:55 +03:00
andreykproductengine 19c3f47e00 MAINT-7325 Fixed issue of images being marked as missing due to uninitialized discard level 2017-05-31 21:24:04 +03:00
pavelkproductengine 9bfcda0a51 MAINT-6882 4k monitor with maximized window overwhelms low end GPUs and crashes viewer 2016-11-10 19:44:51 +02:00
AndreyL ProductEngine f2b32dafa4 MAINT-6729 Fix crash in LLImageGL::analyzeAlpha() 2016-11-29 12:28:21 +02:00
andreykproductengine a72a4cb394 SL-4730 Reduce bias trashing 2018-11-16 17:42:31 +02:00
AndreyL ProductEngine ee40764c45 MAINT-6552 One more nullcheck 2016-07-07 02:30:30 +03:00