diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-04-21 15:14:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-04-21 15:14:19 -0400 |
| commit | 922783ef6695df1eff783d1e597f257ff316181c (patch) | |
| tree | d414c53a2e1a708bfd25c001eedbe096a14eb33a /indra | |
| parent | 185aeb2dcc6953b86e25dcb1c3727e7f1255acbc (diff) | |
| parent | 7f077a5e3a34e68fc8e209884fa9a1d15c57e740 (diff) | |
Merged ruslantproductengine/ruslanteliuk-391-blizzard/tip into default
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index f44e19dbe4..d1944856cb 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -1282,7 +1282,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass) avatarp->mImpostor.bindTexture(1, specular_channel); } } - avatarp->renderImpostor(LLColor4U(255,255,255,255), sDiffuseChannel); + avatarp->renderImpostor(avatarp->getMutedAVColor(), sDiffuseChannel); } return; } |