summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-03-16 11:39:25 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-03-16 11:39:25 -0700
commit3ac40205e9331efde4b1b4f521d5d8bb882565b3 (patch)
treed4c81e7c00161997deebafa81aa6593d92d19d8f /indra/newview/llvoavatar.cpp
parent41ed9b3bcb07b36ff4ba58fb3c68f96c376f6e37 (diff)
parent3bb628ff73c0cd06dc374c29db9f56d5f5ab283a (diff)
Merge
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)