diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 20:34:49 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-12-15 20:34:49 +0000 |
| commit | 0cb712af5cc8be9025fce82eac65408fab759505 (patch) | |
| tree | 0361f80565053ec2183277eeb73c6c6dbf8d06f6 /indra/newview/llviewermessage.h | |
| parent | 101e282ca3d0e8ca0bf10b32a2a4b6362bc66b80 (diff) | |
| parent | e27f9551e1cae0f3fca22989bcbd256a876fd80d (diff) | |
Merged in DV528-merge-6.5.2 (pull request #813)
DRTVWR-528 merge up to 6.5.2
Diffstat (limited to 'indra/newview/llviewermessage.h')
| -rw-r--r-- | indra/newview/llviewermessage.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h index 78829a6a56..1e5a69ae13 100644 --- a/indra/newview/llviewermessage.h +++ b/indra/newview/llviewermessage.h @@ -47,7 +47,6 @@ class LLInventoryObject; class LLInventoryItem; class LLMeanCollisionData; class LLMessageSystem; -class LLVFS; class LLViewerObject; class LLViewerRegion; @@ -189,8 +188,7 @@ void process_script_dialog(LLMessageSystem* msg, void**); void process_load_url(LLMessageSystem* msg, void**); void process_script_teleport_request(LLMessageSystem* msg, void**); void process_covenant_reply(LLMessageSystem* msg, void**); -void onCovenantLoadComplete(LLVFS *vfs, - const LLUUID& asset_uuid, +void onCovenantLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |