diff options
author | McCabe Maxsted | 2009-10-13 01:42:15 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-08-26 11:27:49 -0700 |
commit | c8900e760091a8736a1d9eae6f7eddc07a2b6a97 (patch) | |
tree | f7cb30feaa344c1077e0189675d7ea03564cfc22 /linden | |
parent | Made disable max build constraints also disable max position spinner values (diff) | |
download | meta-impy-c8900e760091a8736a1d9eae6f7eddc07a2b6a97.zip meta-impy-c8900e760091a8736a1d9eae6f7eddc07a2b6a97.tar.gz meta-impy-c8900e760091a8736a1d9eae6f7eddc07a2b6a97.tar.bz2 meta-impy-c8900e760091a8736a1d9eae6f7eddc07a2b6a97.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
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/pipeline.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index e36e296..5e6dc9e 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
@@ -4203,6 +4203,11 @@ void LLPipeline::enableLightsAvatar() | |||
4203 | 4203 | ||
4204 | void LLPipeline::enableLightsAvatarEdit(const LLColor4& color) | 4204 | void LLPipeline::enableLightsAvatarEdit(const LLColor4& color) |
4205 | { | 4205 | { |
4206 | if (mLightingDetail < 1) | ||
4207 | { | ||
4208 | return; | ||
4209 | } | ||
4210 | |||
4206 | U32 mask = 0x2002; // Avatar backlight only, set ambient | 4211 | U32 mask = 0x2002; // Avatar backlight only, set ambient |
4207 | setupAvatarLights(TRUE); | 4212 | setupAvatarLights(TRUE); |
4208 | enableLights(mask); | 4213 | enableLights(mask); |