summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexlayer.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-10-03 18:16:48 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-10-03 18:16:48 -0400
commit13d6a9920d06bd718b632c0980f8340909b8187c (patch)
tree67d55c64b9a951f7ec3ff82823efbd7055c12673 /indra/newview/llviewertexlayer.h
parente29b66ed6ce29528f7b733c51db22a31a05d3a5f (diff)
parent358b0ca5fffbd2357233ba789e8f2f2a9691cf14 (diff)
merge
Diffstat (limited to 'indra/newview/llviewertexlayer.h')
-rw-r--r--indra/newview/llviewertexlayer.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewertexlayer.h b/indra/newview/llviewertexlayer.h
index 9df9474eff..959c883da8 100644
--- a/indra/newview/llviewertexlayer.h
+++ b/indra/newview/llviewertexlayer.h
@@ -55,7 +55,6 @@ public:
/*virtual*/void createComposite();
void setUpdatesEnabled(BOOL b);
BOOL getUpdatesEnabled() const { return mUpdatesEnabled; }
- void gatherMorphMaskAlpha(U8 *data, S32 width, S32 height);
LLVOAvatarSelf* getAvatar();
const LLVOAvatarSelf* getAvatar() const;