Andrey Lihatskiy
|
d9153532b8
|
Merge branch 'main' into marchcat/x-mf-merge
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
|
2024-05-15 12:51:21 +03:00 |
|
Andrey Lihatskiy
|
b06a99f7c7
|
Post-merge spaces fix
|
2024-05-15 12:47:27 +03:00 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +03:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
cosmic-linden
|
6f51d909a2
|
Merge pull request #1337 from secondlife/v-1184
Cached minimap textures still using extra memory/loading still not reliable
|
2024-04-26 09:27:27 -07:00 |
|
Cosmic Linden
|
668c63c2c4
|
secondlife/viewer#1184: Remove logspam
|
2024-04-26 09:25:08 -07:00 |
|
Cosmic Linden
|
aac18ada71
|
secondlife/viewer#1184: Use more robust/memory-friendly setLoadedCallback for minimap gen. Fix some emissive maps.
|
2024-04-25 16:48:07 -07:00 |
|
Brad Linden
|
86c0c1d553
|
Merge remote-tracking branch 'origin/main' into release/materials_featurette
|
2024-04-24 09:55:34 -07:00 |
|
Andrey Lihatskiy
|
428f21cf79
|
Merge branch 'main' into marchcat/x-merge
|
2024-04-24 18:45:54 +03:00 |
|
Cosmic Linden
|
7792e62d3c
|
secondlife/viewer-issues#82: Don't allow transparent texture terrain
|
2024-03-19 16:03:57 -07: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 |
|
Andrey Kleshchev
|
305fe845c6
|
SL-20779 More reliable decode and encode error logging (#615)
|
2024-01-09 23:16:57 +02:00 |
|
Cosmic Linden
|
ab3b4edac7
|
DRTVWR-592: Fix broken minimap loading, improve minimap view of PBR materials (still not accurate, but better...)
|
2023-10-13 10:39:03 -07:00 |
|
Cosmic Linden
|
55f597e2ec
|
DRTVWR-592: Allow using RGBA textures for terrain, as the texture uploader does not consolidate opaque textures
|
2023-10-13 09:56:28 -07: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 |