eb526fec0a
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2022-12-12 17:59:34 -08:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# 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-10-21 18:19:27 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
6db39a6f1d
SL-17778 'Application not responding' popup while cleaning cache on startup
2022-07-21 20:52:54 +03:00
0d250e632c
SL-17329: Fix texture cache not respecting DiskCachePercentOfTotal
2022-06-22 13:28:26 -07:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
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
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
d26567915c
Merge with Master after Viewer release
2021-02-03 09:31:32 -08:00
27117cd8e4
SL-14269 FIXED Textures are corrupt after reducing the cache size.
2020-11-12 20:44:17 +02:00
d07dea27ab
Post-merge leftover cleanup; buildfix
2020-11-11 22:41:32 +02:00
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
ac875d1876
SL-14150 Comment for clarity and removed redundant check
2020-10-23 00:17:29 +03:00
0bf11e45ea
SL-14150 Handle more cases of corrupted cache
2020-10-22 22:22:17 +03:00
2938b8238c
SL-12889 Failed to cache image crashes
2020-05-25 23:59:56 +03:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
d3f389a38c
SL-12326 Textures' apr pool crash fix
2019-11-26 17:21:43 +02:00
185fe0f77b
SL-11418 Mac build fix
2019-06-25 14:48:04 +03:00
7dbadf4c8b
Mac buildfix
2019-06-25 03:32:23 +03:00
baa1c7f6d7
SL-11073
...
Make tex cache not check size logic while performing validation.
2019-05-29 08:17:34 -07:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
aa90985d67
SL-10231 Bug in texture cache size computation
2018-12-12 20:21:21 +02:00
09540c8cd0
SL-775 SL-11418 Texture cache purge stalls viewer
2017-09-28 17:10:38 +03:00
41c0a95365
MAINT-8395 Better loging
2018-06-26 20:19:38 +03:00
6c231ba8a6
MAINT-8395 Rollback part of SL-711 to fix related crashes
2018-06-14 18:30:40 +03:00
6e445e82e2
MAINT-8091 Removed deprecated and unused private memory pooling
2018-01-30 14:03:26 +00:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
5002bf5660
MAINT-8087: Use env vars from VMP for AppData\Roaming and Local.
...
On Windows, when logged in with a non-ASCII username, every one of the three
documented APIs -- SHGetSpecialFolderPath(), SHGetFolderPath() and
SHGetKnownFolderPath() -- fails to retrieve any pathname at all. We cannot
account for the fact that the oldest of these continues to work with the
release viewer and within a Python script (though not, curiously, from a
Python interactive session). With a non-ASCII username, they consistently fail
when called from an Alex Ivy viewer build: "The filename, directory name, or
volume label syntax is incorrect."
Empirically, with a non-ASCII username, the preset APPDATA and LOCALAPPDATA
environment variables are also useless, e.g. c:\Users\??????\AppData\Roaming
where those are, yup, actual question marks.
Empirically, the VMP is able to successfully call SHGetFolderPath() to
retrieve both AppData\Roaming and AppData\Local. Therefore, we make the VMP
set the APPDATA and LOCALAPPDATA environment variables to the UTF-8 encoded
correct pathnames. Instead of calling SHGetSomethingFolderPath() at all, make
LLDir_Win32 retrieve those environment variables.
Make LLFile::mkdir() treat "directory already exists" as a success case. Every
single call fell into one of two categories: either it didn't check success at
all, or it tested specially to exempt errno == EEXIST. Migrate that test into
mkdir(); eliminate it from call sites.
Make LLDir::append() and add() convenience functions accept variadic
arguments. Replace add(add()...) constructs, as well as clumsy concatenations
of directory names and getDirDelimiter(), with simple variadic add() calls.
2017-12-20 22:51:26 -05:00
34d3b49d1f
MAINT-2124 Texture allocation issues
2017-12-05 17:54:17 +02:00
7161619d6c
MAINT-7978 - Fixed allocation crash in doRead(), workers should never crash
2017-11-06 16:46:16 +02:00
76c7eb7310
Backed out changeset: bfa432c3c7d5 (SL-775)
2017-10-23 17:28:18 +03:00
7697f7f9a6
MAINT-7929 Viewer shouldn't attempt to access unreadable cache indefientely
2017-10-23 17:15:00 +03:00
5ee30b7da5
MAINT-7895 Fix for setHeaderCacheEntry infinite loop
2017-10-11 19:37:35 +03:00
e0265d3754
build fix
2017-10-03 12:00:11 +03:00
5844a9372f
SL-775 Texture cache purge improvements
2017-09-28 17:10:38 +03:00
18483e902c
MAINT-7779 Protections against wrong data
2017-09-18 18:11:04 +03:00
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
a0b57c0cd7
SL-776 Disk cache purge not purging headers if headers are corrupt or on version mismatch
2017-08-29 16:45:29 +03:00
d290f2c512
BUG-134134 Additional logging
2017-08-21 17:41:41 +03:00
654aead8a1
SL-684 Improve cache version guard
2017-08-09 18:19:28 +03:00
2e52d12ef1
MAINT-6819 Fix for LLTextureCacheRemoteWorker::doWrite crash
2016-10-19 02:09:47 +03:00
41f1d0b667
MAINT-6123 Fix for LLTextureCache::writeToFastCache crash
2016-09-28 18:39:36 +03:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
8351acc78c
MAINT-6105 FIXED Lowering Cache Size and relogging results in many corrupted textures
2016-02-05 19:30:16 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
1f1b5dc51d
MAINT-5230 FIXED Viewer gets stuck clearing texture cache
2015-06-08 16:25:59 +03:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
Brad Linden