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 @@
+2009-10-13 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Disable avatar appearance facelight when local lighting turned off.
+        
+          modified:   linden/indra/newview/pipeline.cpp
+          
+          
 2009-10-12 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * 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()
 
 void LLPipeline::enableLightsAvatarEdit(const LLColor4& color)
 {
+        if (mLightingDetail < 1)
+        {
+                return;
+        }
+
         U32 mask = 0x2002; // Avatar backlight only, set ambient
         setupAvatarLights(TRUE);
         enableLights(mask);