ba74152c82
Replace BOOST_FOREACH with standard C++ range-based for-loops
2024-01-09 20:44:50 +02:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
1c0d478436
SL-18773 Crash incrementing directory_iterator
...
make_iterator_range doesn't verify errors, replaced with basic increments
2023-01-18 19:20:36 +02:00
3dd874a99b
Fix memory leaks in lldir objc/mac
2022-10-28 18:47:32 -04:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07: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
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
57805cac68
SL-17379 More complete integration of material asset type
2022-06-28 15:15:57 -05:00
7bf25aa8b8
SL-17329: Remove unused extra variable initialization
2022-06-24 13:32:14 -07:00
ccdeac3223
SL-17329: Do logging of individual files after the disk cache purge finishes so it doesn't affect the time measurement.
...
The time resolution of the debug log is in seconds, so it's not particularly useful.
Arguably, one could remove this fine logging in favor of Tracy markers. Or have both. Depends on the use case.
2022-06-22 13:28:25 -07:00
fc7b5549cb
SL-17484 Fix for unit tests. Deprecate non-threaded LLQueuedThread and make lllfsthread threaded.
2022-05-31 16:54:05 -05:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +02:00
e0cf0cdfd4
Switch to target_include_directories
...
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
bb35d5a599
Remove some more obsolete includes (UnixInstall) and include_directories()
2022-04-16 17:30:09 +02:00
bb85651d98
Create a new target ll::oslibrary to link against libs specific to the OS compiled on.
...
This gets rid of the a few OS specific set and uses variables (which some even seemed mostly
duplicate like WINDOWS_LIBRARIES ans UI_LIBRARIES) and it also solves the problem of
having them to tack on every target, as of no they come as a transitive dependency from llcommon
2022-04-16 15:29:02 +02:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
c09155574d
SL-15083 Remove old vfs files
2022-01-11 19:31:51 +02:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
0c3b78105d
Another tweak for 'SL-15547: Viewer hung while looking for a file in cache' - this time based on Henri's suggestion in this discussion: e28c1b46e9 (comment-10537114)
2021-07-21 17:42:08 -07:00
484aa963af
Additional speculative fix for SL-15547: Viewer hung while looking for a file in the cache. I am still unable to reproduce this problem, although others have so I am trying a more aggressive approach for them to test. I tried this as part of last speculative fix but saw what I thought were scary side effects in the log/console. Turns out, those are there in the release viewer so probably unrelated to this change.
2021-07-21 09:09:02 -07:00
e28c1b46e9
Speculative fix for SL-15547: Viewer hung while looking for a file in the cache - since I am unable to repro, this might be enough
2021-07-20 15:03:22 -07:00
fedae88be7
boost::filesystem::directory_iterator uses throw-behavior by default as well
2021-06-11 22:59:55 +02:00
564a7acb32
Change all remaining boost::filesystem methods to their non-throwing overloads
2021-06-11 22:50:39 +02:00
4c558e85bd
Fix more crashes in disk cache due to boost error handling
2021-06-10 01:09:31 +02:00
ad9ed0a94d
Merge with tip of Master after Viewer release
2021-06-07 18:55:00 -07:00
ac8640d338
SL-15200: LLPurgeDiskCacheThread's CHECK_INTERVAL is secs.
2021-05-18 09:51:45 -04:00
b3708ac238
SL-15200: Use new LLApp::sleep() in LLPurgeDiskCacheThread::run().
2021-05-17 15:10:06 -04:00
87faf25891
SL-15200: Explain why purge() is called on another thread.
...
Also add Ansariel's explanation for why interaction through the filesystem
itself should be safe.
2021-05-17 10:24:27 -04:00
89cf988aaf
BUG-230673: Add warning that LLDiskCache::purge() is also called from outside the main thread
2021-05-17 09:49:32 +02:00
0e253cb909
BUG-230673: Trim asset disk cache regularly
2021-05-12 10:45:23 +02:00
c241c5d4b8
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519
2021-05-11 12:59:37 -07:00
3898609ae2
Fix for SL-15226 Simple cache viewer: Integer overflow in cache size - via FS:Ansariel
2021-05-11 12:58:05 -07:00
8633ba9c8b
BUG-230697: Do not crash viewer during cache cleanup
2021-05-11 20:27:07 +02:00
ad2edc1d83
Remove debugging tags
2021-03-09 18:35:30 -08:00
d7518c7b4f
Ansariel kindly offered their patch to help mitigate this round of file system issues - taken from https://vcs.firestormviewer.org/phoenix-firestorm/changeset/104a8600946be01e2de44d10ad069ba854272d1f
2021-03-09 18:33:35 -08: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
60e8f990fd
Addresses SL-14582: Add code to only write the file last access time occasionally
2021-01-08 14:21:58 -08:00
53cae8b21f
SL-14505 FIXED [Win10] The viewer isn't started on the non-English system locale
2020-12-11 16:42:10 +02:00
aae7259a0a
Fix for meta issue: SL-14210 Prune descriptive tag from new cache filenames
2020-10-27 14:02:24 -07:00
391ada1150
Fix for meta issue: SL-14211 Determine optimum cache size for VFS replacement cache
2020-10-27 13:53:17 -07:00
3b4bd86a1d
SL-14182 remove old script asset file after saving changes and allow renaming files if destination file exists
2020-10-27 16:46:31 +02:00
31d80c21b5
macos build fix
2020-10-08 21:17:28 +03:00
Ansariel