0ee528c5fd
Mitigate asset fetch thread stalls from LLDiskCache mutex contention and trivial cleanup
...
Move LLDiskCache::updateFileAccessTime to LLFilesystem as it's the only user of that function.
Change mCacheDir and LLDiskCache::metaDataToFilepath to statics.
2024-08-14 00:31:37 -04:00
9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
03c4458bdc
#1392 GLTF Upload ( #1394 )
...
* #1392 WIP -- Functional texture upload, stubbed out .bin upload.
* #1392 GLTF Upload WIP -- Emulates successful upload
Successfully uploads texture
Emulates successful .gltf and .bin upload by injecting into local asset cache.
Emulates rez from inventory by setting sculpt ID of selected object
Currently fails in tinygltf parsing due to missing .bin
* Add missing notification
* Build fix
* #1392 Add boost::json .gltf reading support.
* #1392 boost::json GLTF writing prototype
* Create gltf/README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* Update README.md
* #1392 Add ability to render directly from LL::GLTF::Material
* Fix for mac build
* Mac build fix
* #1392 AssetType and Inventory Type plumbing
* #1392 More sane error handling and scheduling of uploads.
* #1392 Actually attempt to upload glbin
* Mac build fix, upload nudge
* Mac build fix
* Fix glTF asset uploads to server
* Mac build fix (inline not static)
* More consistent inline
* Add glm, mac nudge.
* #1392 For consistency with spec, start using glm over glh:: and LLFoo
* Another attempt at placating Mac builds
* Another Mac nudge
* Mac build take 23
* #1392 Prune LLMatrix4a from GLTF namespace.
* #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw)
* #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering
* #1392 Working download!
* #1394 Add support for GLTFEnabled SimulatorFeature
* #1392 Review feedback
---------
Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2024-05-20 13:22:55 -05:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07: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
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
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
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
c09155574d
SL-15083 Remove old vfs files
2022-01-11 19:31:51 +02: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
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
3051db7b61
Purge excessive files from disc cache each startup
2020-10-08 15:26:54 +03:00
1a9942a51c
Improve, rationalize and expand comments
2020-10-07 16:43:01 -07:00
5fdc4a1fb4
Add in some cache stats for the about box
2020-10-07 16:03:28 -07:00
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
3092aa8aae
Add in the C++ filesystem based cache and clean up some indempotent functions in llfilesystem
2020-10-06 17:16:53 -07:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
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
d9448c6f52
The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-17 09:45:06 -07:00
Rye Mutt