diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-02-07 20:41:53 +0200 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-02-07 20:41:53 +0200 |
| commit | 0d40ac2ed9ed206d1f20967c09bf88ce0e5702f5 (patch) | |
| tree | 922f352d813884729325e188ae0a32c1ccaf0dae /indra/llmath/llvolume.h | |
| parent | 62aa39983950de85784737deb93df8252ac775d5 (diff) | |
MAINT-8258 Don't show sculpty until it is loaded or load fails
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index a8089f3709..4357b69b90 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -1059,7 +1059,7 @@ public: U32 mFaceMask; // bit array of which faces exist in this volume LLVector3 mLODScaleBias; // vector for biasing LOD based on scale - void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level); + void sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, S32 sculpt_level, bool visible_placeholder); void copyVolumeFaces(const LLVolume* volume); void copyFacesTo(std::vector<LLVolumeFace> &faces) const; void copyFacesFrom(const std::vector<LLVolumeFace> &faces); @@ -1068,7 +1068,8 @@ public: private: void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type); F32 sculptGetSurfaceArea(); - void sculptGeneratePlaceholder(); + void sculptGenerateEmptyPlaceholder(); + void sculptGenerateSpherePlaceholder(); void sculptCalcMeshResolution(U16 width, U16 height, U8 type, S32& s, S32& t); |