diff options
author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-04-01 13:10:33 -0400 |
---|---|---|
committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-04-01 13:10:33 -0400 |
commit | ccdcbfeebd10a78cfb67f5324a3eb17a7d76604b (patch) | |
tree | 9543eb9393ea9f20b3199c86c48a5b4fc5b3f5e1 /indra/newview/llviewerassetstorage.h | |
parent | 497c309a5b148fd86a0e1429343092f0a6ca2e0d (diff) | |
parent | 4ddd9d1fefc3b956e19ef25cfdd199fde352437a (diff) |
Merge branch 'release/2025.03' into release/2025.04
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
-rw-r--r-- | indra/newview/llviewerassetstorage.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index fdb8af7457..42dd9d1dd8 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -82,8 +82,7 @@ protected: void capsRecvForRegion(const LLUUID& region_id, std::string pumpname); - void assetRequestCoro(LLViewerAssetRequest *req, - const LLUUID uuid, + void assetRequestCoro(const LLUUID uuid, LLAssetType::EType atype, LLGetAssetCallback callback, void *user_data); |