diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-26 14:01:17 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-26 14:01:17 +0200 |
commit | 970b6661cddc6bad32f874d3f7676f5e5d5c5ec3 (patch) | |
tree | 63ffcce826a99ac45a71c820f9485297644e95ba /indra/newview/lllandmarklist.h | |
parent | c9343c400487979c206f0bc5fa3d04d70de6870a (diff) | |
parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) |
Merge branch 'master' into DRTVWR-543-maint
Diffstat (limited to 'indra/newview/lllandmarklist.h')
-rw-r--r-- | indra/newview/lllandmarklist.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h index 4f3b11660d..f5fa958204 100644 --- a/indra/newview/lllandmarklist.h +++ b/indra/newview/lllandmarklist.h @@ -52,7 +52,6 @@ public: BOOL assetExists(const LLUUID& asset_uuid); LLLandmark* getAsset(const LLUUID& asset_uuid, loaded_callback_t cb = NULL); static void processGetAssetReply( - LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void* user_data, |