diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
| commit | 5fabfa50d7135d29c0cb8a553006cf9038f9baae (patch) | |
| tree | 1d0f21551bd443d4e1ba187480c082d612dfaac5 /indra/llmath/llvolume.h | |
| parent | 627e3d51c61778e07e350689ce68ede24afe61ab (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index e8faf549f4..ad6a669531 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -1105,8 +1105,12 @@ protected: BOOL generate(); void createVolumeFaces(); public: - virtual bool unpackVolumeFaces(std::istream& is, S32 size); + bool unpackVolumeFaces(std::istream& is, S32 size); + bool unpackVolumeFaces(U8* in_data, S32 size); +private: + bool unpackVolumeFacesInternal(const LLSD& mdl); +public: virtual void setMeshAssetLoaded(BOOL loaded); virtual BOOL isMeshAssetLoaded(); |