livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,960 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

169 Commits (85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9)

Author SHA1 Message Date
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge 
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
 2024-04-24 19:28:15 +03:00
Maxim Nikolenko 5771736bd2
SL-20799 FIXED Viewer crashes when trying to save snapshot on disc without empty space 2024-01-12 14:04:46 +02:00
Alexander Gavriliuk 74c8b028d4 SL-20743 Use LLMutex in LLImageBase for internal data thread-safety 2023-12-21 19:12:52 +01:00
Alexander Gavriliuk 7f9438ed2b SL-3508 Crash in LLKDUDecodeState::processTileDecode 2023-12-15 07:45:05 +01:00
Dave Parks dbc641ce52 SL-18861 Optimize away alpha channel on GLTF material imports. 2022-12-16 12:22:23 -06:00
Dave Parks 197ac7cc20 Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559 2022-08-30 10:46:36 -05:00
Dave Parks 18b0aa0371 SL-17619 Add support for embedded textures to GLTF importer 2022-06-16 16:16:53 -05:00
Dave Parks 34e79c8f4e SL-17005 WIP Simplify what feeds texture loading bias to only pay attention to available memory according to OS and GL driver, not (broken) internal accounting (breaks intel GPUs, compatibility pass incoming). 2022-03-11 10:21:08 -06:00
Ptolemy 5b67aa2c58 SL-16933: Fix texture stat Raw Total always increasing 2022-03-07 19:11:59 -08:00
Dave Parks f47730b92c SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled. 2022-02-14 18:07:24 +00:00
Dave Houlton fdc4a81b57 Revert "Merged in euclid-16418 (pull request #846)" 
This reverts commit 40fe5277e1, reversing
changes made to af830e5fc5.
 2022-02-01 15:49:32 -07:00
Dave Houlton d28a271fa8 SL-16418 add some big-endian future-proofing 2022-01-28 09:43:21 -07:00
Dave Houlton 8d0efb54db SL-16418 rename media tex image per-update to avoid contention stall 2022-01-27 17:09:29 -07:00
Dave Houlton c8926630af SL-16418 optimize imageraw clear 2022-01-27 15:44:35 -07:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Andrey Lihatskiy 0bffd3d365 Merge branch 'master' into DRTVWR-519 
# Conflicts:
#	README.md
 2021-11-16 01:21:05 +02:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Andrey Kleshchev dc1d8031f1 SL-15788 Crash throw_std_bad_alloc in LLImageRaw's scale 2021-08-09 23:55:05 +03:00
Callum Prentice 168d177197 This set of changes reverts the merge with master (git revert c83e740) and 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-09 14:39:51 -08: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
Callum Prentice d26567915c Merge with Master after Viewer release 2021-02-03 09:31:32 -08: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 372ed555ed SL-13348 Thread crashing singleton #2 
Reverted LLImage to singleton conversion
 2020-05-29 21:53:43 +03:00
AndreyL ProductEngine 56056aa198 Upstream merge from viewer-neko 2019-11-27 23:20:03 +02:00
AndreyL ProductEngine 84f3b2865f Merged in lindenlab/viewer-release 2019-11-12 00:39:07 +02:00
andreykproductengine 55983b9abd SL-10908 One more safeguard 2019-08-05 20:52:18 +03:00
andreykproductengine 17fae30f72 DRTVWR-493 LLImage to LLParamSingleton 2019-07-25 15:17:11 +03:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
andreykproductengine e24d4c9f4d MAINT-8923 Better allocation failure handling, createGLTexture crashes 2018-07-26 20:06:26 +03:00
Andrey Kleshchev 6e445e82e2 MAINT-8091 Removed deprecated and unused private memory pooling 2018-01-30 14:03:26 +00:00
AndreyL ProductEngine 57a99273ed Merged in lindenlab/viewer-release 2018-01-17 03:20:12 +02:00
Nat Goodspeed e3a2c5e321 DRTVWR-418: Merge from latest viewer-release 2017-11-29 14:47:09 -05:00
andreykproductengine e5ef898728 MAINT-8028 Fixed memory leak in allocateDataSize() 2017-11-27 15:02:33 +02:00
andreykproductengine d7732280a9 Merged from viewer-lynx 2017-10-27 21:00:18 +03:00
Nat Goodspeed 0c7bc67814 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-10-11 14:35:49 -04: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
AndreyL ProductEngine a65b586b18 MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha() 2016-12-08 17:21:05 +02:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
AndreyL ProductEngine f75ea457c8 MAINT-6818 Fix for LLImageBase::allocateData crash 2016-10-19 01:12:52 +03:00
Rider Linden 100aa4b79e Merge 2016-09-16 14:59:52 -07:00
Oz Linden 8c86c594be paren fix 2016-09-06 11:01:02 -04:00
Oz Linden 53f9fbcfb7 add run time error checking to LLImageRaw::scale 2016-09-06 09:11:10 -04:00
AndreyL ProductEngine 5e02d304f0 MAINT-6618 More checks 2016-08-09 19:26:30 +03:00
AndreyL ProductEngine d4b1db277c MAINT-6618 Fixed the crash in LLImageRaw::scale() + some additional checks 2016-08-09 05:07:39 +03:00
AndreyL ProductEngine 2339e759fc MAINT-4327/MAINT-6584 Supress the crash on memory allocation error when decoding J2C images 2016-07-27 05:49:07 +03:00
Nat Goodspeed acdb050ce5 MAINT-6584: Convert LLImage class hierarchy to standard 'bool' 
instead of legacy BOOL.
 2016-07-22 11:35:23 -04:00
Nicky e8aa2dd71f x64: Do not use a union of LLColor4U. Especially having the two pointer in there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size. 
(transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
 2016-04-22 14:58:25 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
ruslantproductengine c3affc4d6b Hotfix for build on OSX with -Werror,-Wtautological-compare 2015-05-05 21:05:13 +03:00