diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
| commit | aae241c43f66c3ef59cb076d00e42f9a857de354 (patch) | |
| tree | 82da2afc116915897a3207cc8eed120aef5ef3fd /indra/llmath/llvolume.h | |
| parent | 17bb7f4fc5463e9426179b0ded810b51ef291c79 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
merge changes for 5.1.2-release
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index bba691d243..a8089f3709 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -903,7 +903,7 @@ public: }; void optimize(F32 angle_cutoff = 2.f); - void cacheOptimize(); + bool cacheOptimize(); void createOctree(F32 scaler = 0.25f, const LLVector4a& center = LLVector4a(0,0,0), const LLVector4a& size = LLVector4a(0.5f,0.5f,0.5f)); @@ -1063,7 +1063,7 @@ public: void copyVolumeFaces(const LLVolume* volume); void copyFacesTo(std::vector<LLVolumeFace> &faces) const; void copyFacesFrom(const std::vector<LLVolumeFace> &faces); - void cacheOptimize(); + bool cacheOptimize(); private: void sculptGenerateMapVertices(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, const U8* sculpt_data, U8 sculpt_type); |