summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-03-23 23:02:02 -0400
committerKent Quirk <q@lindenlab.com>2010-03-23 23:02:02 -0400
commit62ebb4533ceff1d0a7cf68a6385a8d3b34fa51d4 (patch)
treedd6cd1b313f933847c6e603d50a65ffbc82fee01 /indra/newview/llvoavatar.cpp
parent3ad56f22158dd2665204745af2171689f208cd7e (diff)
parentea8f1b80df0fcfcdbb52123b2ece68916ed139ff (diff)
Merge from viewer-2-0
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r--indra/newview/llvoavatar.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 72b9c6df98..f5e83ed025 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -5785,11 +5785,6 @@ void LLVOAvatar::invalidateAll()
{
}
-// virtual
-void LLVOAvatar::setCompositeUpdatesEnabled( BOOL b )
-{
-}
-
void LLVOAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color, BOOL upload_bake )
{
if (global_color == mTexSkinColor)