diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-03-10 11:59:23 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-03-10 11:59:23 -0800 |
| commit | 45af049a479928208a1ad30a90c1db6be1969f9a (patch) | |
| tree | e40aabda6866b3ca163e0ffe86127fd49332278a /indra/newview/llvovolume.h | |
| parent | b1add74c31cfd28c1e671470991254b4545fb573 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/newview/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 73eeec813c..ce400a3498 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -218,9 +218,10 @@ public: void updateSculptTexture(); void setIndexInTex(U32 ch, S32 index) { mIndexInTex[ch] = index ;} void sculpt(); - static void rebuildMeshAssetCallback(const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status); + static void rebuildMeshAssetCallback(LLVFS *vfs, + const LLUUID& asset_uuid, + LLAssetType::EType type, + void* user_data, S32 status, LLExtStat ext_status); void updateRelativeXform(bool force_identity = false); /*virtual*/ BOOL updateGeometry(LLDrawable *drawable); |