diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-01-10 13:24:18 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-01-10 13:24:18 -0500 |
| commit | 003e63268028ffe81fa4c97d5006d58ca382fd42 (patch) | |
| tree | c118ea7194296a5170df16cebfcec3a399624265 /indra/llappearance/lltexlayer.h | |
| parent | 5e7f36541b503bb2bd03e121c7ef13025f69065a (diff) | |
| parent | 008e078bf5c7bd3b72eacecb200733715841afe4 (diff) | |
merge
Diffstat (limited to 'indra/llappearance/lltexlayer.h')
| -rw-r--r-- | indra/llappearance/lltexlayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/lltexlayer.h b/indra/llappearance/lltexlayer.h index 405d2c7df4..959d6e499a 100644 --- a/indra/llappearance/lltexlayer.h +++ b/indra/llappearance/lltexlayer.h @@ -160,7 +160,7 @@ public: BOOL findNetColor(LLColor4* color) const; /*virtual*/ BOOL blendAlphaTexture(S32 x, S32 y, S32 width, S32 height); // Multiplies a single alpha texture against the frame buffer /*virtual*/ void gatherAlphaMasks(U8 *data, S32 originX, S32 originY, S32 width, S32 height); - BOOL renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLColor4 &layer_color); + void renderMorphMasks(S32 x, S32 y, S32 width, S32 height, const LLColor4 &layer_color, bool force_render); void addAlphaMask(U8 *data, S32 originX, S32 originY, S32 width, S32 height); /*virtual*/ BOOL isInvisibleAlphaMask() const; |