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/llvovolume.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/llvovolume.h')
| -rw-r--r-- | indra/newview/llvovolume.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index b8c6f47bbd..d158044f5d 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -218,10 +218,9 @@ public: void updateSculptTexture(); void setIndexInTex(U32 ch, S32 index) { mIndexInTex[ch] = index ;} void sculpt(); - static void rebuildMeshAssetCallback(LLVFS *vfs, - const LLUUID& asset_uuid, - LLAssetType::EType type, - void* user_data, S32 status, LLExtStat ext_status); + static void rebuildMeshAssetCallback(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); |