summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-09-11 17:59:29 -0400
committerOz Linden <oz@lindenlab.com>2015-09-11 17:59:29 -0400
commit58db3502238db8c1580783d6d89bf8946bc863da (patch)
tree6714bcc9826045d5691f0510c069e456092e6c8b /indra/newview/pipeline.cpp
parentd81383b46824404cf01c097324e8c1bc2cb0cece (diff)
MAINT-5622: correct rendering of explicitly derendered and blocked avatars
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 4365c28a5e..46e25b8b04 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -11571,16 +11571,16 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
}
- if (too_complex)
+ if (visually_muted)
{ // Visually muted avatar
LLColor4 muted_color(avatar->getMutedAVColor());
- LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID() << " set jellybaby " << muted_color << LL_ENDL;
+ LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID() << " MUTED set solid color " << muted_color << LL_ENDL;
gGL.diffuseColor4fv( muted_color.mV );
}
else
{ //grey muted avatar
- LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID() << " set grey" << LL_ENDL;
- gGL.diffuseColor4ub(64,64,64,255);
+ LL_DEBUGS_ONCE("AvatarRenderPipeline") << "Avatar " << avatar->getID() << " MUTED set grey" << LL_ENDL;
+ gGL.diffuseColor4fv(LLColor4::pink.mV );
}
{