cb10f3b149
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
2022-11-11 12:15:54 +01:00
3dd874a99b
Fix memory leaks in lldir objc/mac
2022-10-28 18:47:32 -04:00
656dd12dfc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:35:44 +02:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
30df86e318
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
2022-06-29 22:07:42 +02:00
7bf25aa8b8
SL-17329: Remove unused extra variable initialization
2022-06-24 13:32:14 -07:00
cfb6c083fe
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/llfilesystem/lldiskcache.cpp
# indra/llwindow/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
2022-06-24 22:18:44 +02: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
7d7aff4377
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# indra/llprimitive/llmodel.cpp
# indra/llprimitive/llmodel.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
a74de2d794
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 19:14:31 +01:00
f0352ff093
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:49:24 +01:00
c97777d106
don't warn when LL_PATH_NONE was deliberately selected
2022-02-12 20:26:22 +00:00
1edfb172f5
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.h
# indra/newview/app_settings/settings.xml
2022-01-12 16:46:56 +01:00
c09155574d
SL-15083 Remove old vfs files
2022-01-11 19:31:51 +02:00
6663bc6f85
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llviewercontrol.cpp
2021-12-16 09:49:35 +01:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
627eecd577
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 08:22:59 +01:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
7a845ee23b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522
2021-09-20 12:59:14 +02:00
7f1ebf1df8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:24:49 +02:00
931fec6d7a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-09-20 11:12:47 +02:00
e0948b78b1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-08-31 14:46:36 +02:00
ac70e21c93
More boost::filesystem failure checks
2021-08-30 13:59:36 +02:00
9dee543ea3
Revert "Simple cache viewer: Enable some cache purge log output for testing"
...
This reverts commit ad952d6744
2021-08-30 10:03:56 +02:00
749dfbb182
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-08-10 12:14:24 +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
4c4dfb682a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 13:35:31 +02:00
e219b5cb41
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-07-21 13:18:06 +02:00
eb5d535cb6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 13:15:50 +02:00
9718a38e9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 03:07:48 +02: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
775adeb647
FIRE-31070: Crash on clearing cache on macOS and Linux.
2021-07-17 19:23:45 -05:00
738e5c2659
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-15 19:56:26 +02:00
ec8bef8e9c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/bugsplat.cmake
# indra/newview/llappdelegate-objc.mm
2021-07-06 10:32:52 +02:00
a4e0fde3ee
Shuffle stuff around
2021-07-06 09:50:32 +02:00
e6d4f07c2f
Make GCC happy.
2021-07-05 16:07:36 -04:00
98b19c8845
Additional static cache fixes to prevent purging
2021-07-05 14:46:55 +01:00
cbe3910620
Cleanup cache clearing to re-enable threaded clear
...
fixup silly mis-edits
2021-07-04 00:12:13 +01:00
6d6c48d609
[FIRE-31003] Add back static cache (opensim) + pre-cache pose stand
2021-07-04 00:12:13 +01:00
7b5f815b94
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-27 15:01:27 +02:00
e893536a3a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 16:02:59 +02:00
9563ab543b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 11:56:38 +02:00
8e2adbcde7
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-06-15 12:04:03 +02:00
2f228886d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-15 12:01:32 +02:00
fedae88be7
boost::filesystem::directory_iterator uses throw-behavior by default as well
2021-06-11 22:59:55 +02:00
3c3aaaccb0
Simple Cache Viewer: boost::filesystem::recursive_directory_iterator uses throw-behavior by default as well...
2021-06-11 22:58:42 +02:00
564a7acb32
Change all remaining boost::filesystem methods to their non-throwing overloads
2021-06-11 22:50:39 +02:00
3b8252340c
Simple Cache Viewer: Change all remaining boost::filesystem methods to their non-throwing overloads
2021-06-11 22:50:19 +02:00
Ansariel