livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
73,626 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

28 Commits (cbf6aca2e8ebd32d29b70f2d582044153da05eab)

Author SHA1 Message Date
Ansariel 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
Beq 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
Ansariel 749dfbb182 Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer 2021-08-10 12:14:24 +02:00
Callum Prentice 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
Callum Prentice 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
Ansariel e219b5cb41 Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer 2021-07-21 13:18:06 +02:00
Callum Prentice 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
Ansariel 2ea6f51200 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm 2021-05-25 09:11:03 +02:00
Ansariel 438bced137 Simple cache viewer: Add file read/write checks 2021-05-12 13:49:15 +02:00
Ansariel 04b074f3b5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-02 17:30:58 +02:00
Beq 2ce328282a profiling cleanup ready to merge back 
put proper markers in place where forgotten before
 2021-03-21 15:13:02 +00:00
Beq eb0bfc9e10 more cleanup of telemetry support 
remove superfluous cmake changes
rename profiler to telemetry to avoid confusion
 2021-03-21 14:59:02 +00:00
Beq bd20cfad1d Ensure clean compile when 3p-Tracy not installed 2021-03-21 14:29:03 +00:00
Beq 07d2b1b6fd benchmark for FileSystem cache changes 2021-03-21 14:29:03 +00:00
Ansariel 2c57d7164e Switch to C I/O API for asset cache 2021-03-10 22:19:13 +01:00
Ansariel cc3efca9be Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-10 16:31:59 +01:00
Ansariel e6c34f01d2 Revert revert of Simplified Cache viewer release - continue with simplified cache 
This reverts commit 40ad606ae0, reversing
changes made to 906cfe699d.
 2021-03-10 15:13:12 +01:00
Callum Prentice 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
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
Andrey Lihatskiy b1ab29eeb6 SL-14939 Fixed the log spam 
fix by Ansariel (https://vcs.firestormviewer.org/phoenix-firestorm/changeset/5f927b52fdfeebb5db595c7c60c711cee383820b)
 2021-03-03 19:27:22 +02:00
Mnikolenko Productengine 53cae8b21f SL-14505 FIXED [Win10] The viewer isn't started on the non-English system locale 2020-12-11 16:42:10 +02:00
Mnikolenko Productengine 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
Callum Prentice 08dfc0836f This changeset hooks up many things that have been in progress and moves things about between llfilesystem and lldiskcache - there is still some bookkeeping work left but this is the first version that appears to work and actively manage the cache 2020-10-07 15:25:12 -07:00
Callum Prentice a0ea119623 Replace references to static writefile with write so we end up with only a single read and a single write function 2020-10-06 18:18:18 -07:00
Callum Prentice 3092aa8aae Add in the C++ filesystem based cache and clean up some indempotent functions in llfilesystem 2020-10-06 17:16:53 -07:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Callum Prentice 96e2873bfa Rename lldiskcache.* to llfilesystem.* - i think this is the right name since it's responsible for performing file system operations and (will eventually) delegrate to a separate disk cache component to save/load data and keep track of metadata etc. 2020-09-24 10:23:39 -07:00