diff options
author | McCabe Maxsted | 2009-10-13 01:42:15 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-13 01:42:15 -0700 |
commit | 575931aff44a02f0b727211c82c589907650e580 (patch) | |
tree | 151653f261de8898720236a49ebd9451f035ab98 | |
parent | Only enable import/export of shapes if they're full perm and you're the creator (diff) | |
download | meta-impy-575931aff44a02f0b727211c82c589907650e580.zip meta-impy-575931aff44a02f0b727211c82c589907650e580.tar.gz meta-impy-575931aff44a02f0b727211c82c589907650e580.tar.bz2 meta-impy-575931aff44a02f0b727211c82c589907650e580.tar.xz |
Disable avatar appearance facelight when local lighting turned off
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/newview/pipeline.cpp | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index bd337c4..a28d812 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,10 @@ | |||
1 | 2009-10-13 McCabe Maxsted <hakushakukun@gmail.com> | ||
2 | |||
3 | * Disable avatar appearance facelight when local lighting turned off. | ||
4 | |||
5 | modified: linden/indra/newview/pipeline.cpp | ||
6 | |||
7 | |||
1 | 2009-10-12 McCabe Maxsted <hakushakukun@gmail.com> | 8 | 2009-10-12 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 9 | ||
3 | * Only enable import/export of shapes if they're full perm and you're the creator. | 10 | * Only enable import/export of shapes if they're full perm and you're the creator. |
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index 67af961..efb5ff6 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
@@ -3596,6 +3596,11 @@ void LLPipeline::enableLightsAvatar() | |||
3596 | 3596 | ||
3597 | void LLPipeline::enableLightsAvatarEdit(const LLColor4& color) | 3597 | void LLPipeline::enableLightsAvatarEdit(const LLColor4& color) |
3598 | { | 3598 | { |
3599 | if (mLightingDetail < 1) | ||
3600 | { | ||
3601 | return; | ||
3602 | } | ||
3603 | |||
3599 | U32 mask = 0x2002; // Avatar backlight only, set ambient | 3604 | U32 mask = 0x2002; // Avatar backlight only, set ambient |
3600 | setupAvatarLights(TRUE); | 3605 | setupAvatarLights(TRUE); |
3601 | enableLights(mask); | 3606 | enableLights(mask); |