summaryrefslogtreecommitdiff
path: root/indra/llmath/llvolume.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-05-22 13:16:37 -0700
committerRider Linden <rider@lindenlab.com>2018-05-22 13:16:37 -0700
commit3888de9439c20eb1698e16fb878a47d78cfdf85e (patch)
tree1d0b9b739f1429f1387934ce7c6a92cd61f1a857 /indra/llmath/llvolume.h
parent656967b326c59a3966261cd75e256e3a7a27cc0a (diff)
parentc70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff)
Merge
Diffstat (limited to 'indra/llmath/llvolume.h')
-rw-r--r--indra/llmath/llvolume.h5
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);