aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-13 01:42:15 -0700
committerMcCabe Maxsted2010-08-28 05:01:43 -0700
commit6d6e8d3ecdcc641e3243778c4790dbd4f08fcb5a (patch)
tree281e7b780dce86a52eed79447f18dae6992e8815
parentTidied up texture picker, added explanatory text (diff)
downloadmeta-impy-6d6e8d3ecdcc641e3243778c4790dbd4f08fcb5a.zip
meta-impy-6d6e8d3ecdcc641e3243778c4790dbd4f08fcb5a.tar.gz
meta-impy-6d6e8d3ecdcc641e3243778c4790dbd4f08fcb5a.tar.bz2
meta-impy-6d6e8d3ecdcc641e3243778c4790dbd4f08fcb5a.tar.xz
Reapply 575931: Disable avatar appearance facelight when local lighting turned off. Prolly an old patch from Emerald that got lost in the last rebase
-rw-r--r--linden/indra/newview/pipeline.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 6b00ca6..14896e1 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -4204,6 +4204,11 @@ void LLPipeline::enableLightsAvatar()
4204 4204
4205void LLPipeline::enableLightsAvatarEdit(const LLColor4& color) 4205void LLPipeline::enableLightsAvatarEdit(const LLColor4& color)
4206{ 4206{
4207 if (mLightingDetail < 1)
4208 {
4209 return;
4210 }
4211
4207 U32 mask = 0x2002; // Avatar backlight only, set ambient 4212 U32 mask = 0x2002; // Avatar backlight only, set ambient
4208 setupAvatarLights(TRUE); 4213 setupAvatarLights(TRUE);
4209 enableLights(mask); 4214 enableLights(mask);