diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c042fc3fd..2a8634b00 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2116,6 +2116,17 @@ This should be as low as possible, but too low may break functionality</string>
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>AppearanceSpecialLighting</key>
+    <map>
+      <key>Comment</key>
+      <string>When in appearance editing mode, avatar is shown with special lighting</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>1</boolean>
+    </map>
     <key>ApplyColorImmediately</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp
index 2f6214e5b..ab1e27876 100644
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -629,7 +629,7 @@ void LLFloaterCustomize::updateVisiblity(bool force_disable_camera_switch/*=fals
 	{
 		if(force_disable_camera_switch || !gAgentCamera.cameraCustomizeAvatar() || !gAgentCamera.getCameraAnimating() || (gMorphView && gMorphView->getVisible()))
 		{
-			if(gAgentAvatarp)gAgentAvatarp->mSpecialRenderMode = 3;
+			if (gAgentAvatarp && gSavedSettings.getBOOL("AppearanceSpecialLighting")) gAgentAvatarp->mSpecialRenderMode = 3;
 			setVisibleAndFrontmost(TRUE);
 		}
 	}