summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-08 22:10:07 -0400
committerOz Linden <oz@lindenlab.com>2011-07-08 22:10:07 -0400
commit9ee4051df097d7a24efd46c26614fd69df5ed63f (patch)
tree53868be5d3c3211a3941415ee2fdd36a05a4fd18 /indra/newview/llvoavatar.cpp
parent093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (diff)
parentbef014ad2ab9496755ef266cdfaeb9f9c333b240 (diff)
merge changes for storm-1491
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rw-r--r--indra/newview/llvoavatar.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 8eda6346b0..3f98df9eb9 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -7270,9 +7270,9 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
llinfos << "Re-requesting AvatarAppearance for object: " << getID() << llendl;
LLAvatarPropertiesProcessor::getInstance()->sendAvatarTexturesRequest(getID());
mRuthTimer.reset();
- }
- else
- {
+ }
+ else
+ {
llinfos << "That's okay, we already have a non-default shape for object: " << getID() << llendl;
// we don't really care.
}