summaryrefslogtreecommitdiff
path: root/indra/llimage/llimage.cpp
AgeCommit message (Collapse)Author
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-10-28SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove ↵Dave Parks
LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-08-09SL-15788 Crash throw_std_bad_alloc in LLImageRaw's scaleAndrey Kleshchev
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.
2021-02-03Merge with Master after Viewer releaseCallum Prentice
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-05-29SL-13348 Thread crashing singleton #2Andrey Kleshchev
Reverted LLImage to singleton conversion
2019-11-27Upstream merge from viewer-nekoAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-05SL-10908 One more safeguardandreykproductengine
2019-07-25DRTVWR-493 LLImage to LLParamSingletonandreykproductengine
2019-01-14SL-10291 Replace apr_mutex with standard C++11 functionalityandreykproductengine
2018-07-26MAINT-8923 Better allocation failure handling, createGLTexture crashesandreykproductengine
2018-01-30MAINT-8091 Removed deprecated and unused private memory poolingAndrey Kleshchev
2018-01-17Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2017-11-29DRTVWR-418: Merge from latest viewer-releaseNat Goodspeed
2017-11-27MAINT-8028 Fixed memory leak in allocateDataSize()andreykproductengine
2017-10-27Merged from viewer-lynxandreykproductengine
2017-10-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-06-06[SL-711] - Eliminate some overheads in texturecache.ruslantproductengine
- Eliminate memory overhead when need duplicated scaled image. - Small improvement in LLImageBase::getCodecFromExtension()
2016-12-08MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()AndreyL ProductEngine
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-10-19MAINT-6818 Fix for LLImageBase::allocateData crashAndreyL ProductEngine
2016-09-16MergeRider Linden
2016-09-06paren fixOz Linden
2016-09-06add run time error checking to LLImageRaw::scaleOz Linden
2016-08-09MAINT-6618 More checksAndreyL ProductEngine
2016-08-09MAINT-6618 Fixed the crash in LLImageRaw::scale() + some additional checksAndreyL ProductEngine
2016-07-27MAINT-4327/MAINT-6584 Supress the crash on memory allocation error when ↵AndreyL ProductEngine
decoding J2C images
2016-07-22MAINT-6584: Convert LLImage class hierarchy to standard 'bool'Nat Goodspeed
instead of legacy BOOL.
2016-04-22x64: Do not use a union of LLColor4U. Especially having the two pointer in ↵Nicky
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)
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-05-05Hotfix for build on OSX with -Werror,-Wtautological-compareruslantproductengine
2015-04-28Merge viewer-release, become version 3.7.29Mnikolenko ProductEngine
2015-04-10restore the ll[io]fstream because we need them as wrappers on Windows for ↵Oz Linden
wide char paths; on other platforms they are now just typedefs to the std classes
2015-04-07replace llifstream and llofstream with std::ifstream and std::ofstream ↵Oz Linden
respectively
2015-04-07convert llifstream and llofstream to std::ifstream and std::ofstream ↵Oz Linden
respectively
2015-02-23MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no ↵ruslantproductengine
apparent reason Linux & OS X compile error fix
2015-02-23Backed out changeset: 81b8de17a195ruslantproductengine
2015-02-23MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no ↵ruslantproductengine
apparent reason Linux & OS X compile error fix
2015-02-23Backed out changeset: 4c24cfce033aruslantproductengine
2015-02-23MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no ↵ruslantproductengine
apparent reason Linux & OS X compile error fix
2015-02-20MAINT-4329 FIXED LLImageRaw::scale() scales each image *twice* for no ↵ruslantproductengine
apparent reason
2015-02-13MAINT-4329 Backed out changeset: fd3a4d5c2cf5ruslantproductengine
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2014-09-25MAINT-4329 FIXED scales each image *twice* for no apparent reason : patchset #2ruslantproductengine
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 05:41:16 +0000