diff options
author | Runitai Linden <davep@lindenlab.com> | 2021-12-17 09:27:19 -0600 |
---|---|---|
committer | Runitai Linden <davep@lindenlab.com> | 2021-12-17 09:27:19 -0600 |
commit | 92933b42522b37ad78fd714e8416681183d7d7f9 (patch) | |
tree | 3a859deda6047d28df3e2bd04c4299ca21c81495 /indra/newview/llviewermessage.h | |
parent | dd032467357a4aaf69c752c13e53122aff6c4755 (diff) | |
parent | 3ac21ebbf6b354e16ead2d095a61152c95a7243c (diff) |
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
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); |