diff options
| author | prep <prep@lindenlab.com> | 2013-01-09 12:43:53 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2013-01-09 12:43:53 -0500 |
| commit | 1f17cac7e86d0241c6d744a77084ba109c7c5533 (patch) | |
| tree | c599423a89a42843309c006d0bb8e39c8dacdce8 /indra/llappearance/lltexlayer.h | |
| parent | 8e8765535f94d3084305ef7b9e4644ec92d10723 (diff) | |
| parent | e1af26eaa2e3d065129821fe1e9458fa2698d72e (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; |