diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-05 17:40:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-05 17:40:04 -0500 |
| commit | 295a4c63b4912f05a729178e8e34ba26e92ff37b (patch) | |
| tree | 19fc1232fc6f8040ce5598fdd9649646116f7ea9 /indra/llappearance/llpolymorph.h | |
| parent | 2d8ad89f33e9fa65dea11fd4c78962fc568ee00a (diff) | |
| parent | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff) | |
merge changes for 5.0.0-release
Diffstat (limited to 'indra/llappearance/llpolymorph.h')
| -rw-r--r-- | indra/llappearance/llpolymorph.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llappearance/llpolymorph.h b/indra/llappearance/llpolymorph.h index 3c2c68079c..c6133cd831 100644 --- a/indra/llappearance/llpolymorph.h +++ b/indra/llappearance/llpolymorph.h @@ -182,6 +182,8 @@ public: void applyMask(U8 *maskData, S32 width, S32 height, S32 num_components, BOOL invert); void addPendingMorphMask() { mNumMorphMasksPending++; } + void applyVolumeChanges(F32 delta_weight); // SL-315 - for resetSkeleton() + void* operator new(size_t size) { return ll_aligned_malloc_16(size); |