summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-16 17:39:32 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-16 17:39:32 +0000
commit3bb628ff73c0cd06dc374c29db9f56d5f5ab283a (patch)
treeaec7ced6a886bd19fbc2c39147ff5be95d864d5f /indra/newview/llvoavatar.cpp
parentb6e11798acf6d0539211723e566be7f6145ac138 (diff)
parenta5d1a7b1bac43a4aa88aa647b040a21ca951c682 (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)