summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-16 12:33:25 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-03-16 12:33:25 -0700
commit60c4621500e478d66a8bdc3a1c80573be2860fee (patch)
treefa10b52caf3a54e03502058cd52d77952370cb34 /indra/newview/llvoavatar.cpp
parent2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff)
parentba414d500ca8cb88da530c89ba373c95195ce633 (diff)
Automated merge from viewer/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 fd90c024f1..431aa6f955 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)