diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 1f3da545d4..55d0e20ddd 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1943,6 +1943,10 @@ void LLFloaterPreference::refreshEnabledState()
 
 	ctrl_shadow->setEnabled(enabled);
 	
+	// <FS:Ansariel> Options for Chalice Yao's simple avatar shadows via Marine Kelley
+	LLComboBox* ctrl_avatar_shadow = getChild<LLComboBox>("AvatarShadowDetail");
+	ctrl_avatar_shadow->setEnabled(enabled && ctrl_shadow->getValue().asInteger() > 0);
+	// </FS:Ansariel>
 
 	// now turn off any features that are unavailable
 	disableUnavailableSettings();
@@ -1968,6 +1972,8 @@ void LLFloaterPreference::disableUnavailableSettings()
 	LLComboBox* ctrl_shadows = getChild<LLComboBox>("ShadowDetail");
 	LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
 	LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
+	// <FS:Ansariel> Options for Chalice Yao's simple avatar shadows via Marine Kelley
+	LLComboBox* ctrl_avatar_shadow = getChild<LLComboBox>("AvatarShadowDetail");
 
 	// if vertex shaders off, disable all shader related products
 	if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"))
@@ -1989,7 +1995,12 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
-		
+
+		// <FS:Ansariel> Options for Chalice Yao's simple avatar shadows via Marine Kelley
+		ctrl_avatar_shadow->setEnabled(FALSE);
+		ctrl_avatar_shadow->setValue(0);
+		// </FS:Ansariel>
+
 		ctrl_ssao->setEnabled(FALSE);
 		ctrl_ssao->setValue(FALSE);
 
@@ -2012,6 +2023,11 @@ void LLFloaterPreference::disableUnavailableSettings()
 		//deferred needs windlight, disable deferred
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
+
+		// <FS:Ansariel> Options for Chalice Yao's simple avatar shadows via Marine Kelley
+		ctrl_avatar_shadow->setEnabled(FALSE);
+		ctrl_avatar_shadow->setValue(0);
+		// </FS:Ansariel>
 		
 		ctrl_ssao->setEnabled(FALSE);
 		ctrl_ssao->setValue(FALSE);
@@ -2032,7 +2048,12 @@ void LLFloaterPreference::disableUnavailableSettings()
 	{
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
-		
+
+		// <FS:Ansariel> Options for Chalice Yao's simple avatar shadows via Marine Kelley
+		ctrl_avatar_shadow->setEnabled(FALSE);
+		ctrl_avatar_shadow->setValue(0);
+		// </FS:Ansariel>
+
 		ctrl_ssao->setEnabled(FALSE);
 		ctrl_ssao->setValue(FALSE);
 
@@ -2058,6 +2079,11 @@ void LLFloaterPreference::disableUnavailableSettings()
 	{
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
+
+		// <FS:Ansariel> Options for Chalice Yao's simple avatar shadows via Marine Kelley
+		ctrl_avatar_shadow->setEnabled(FALSE);
+		ctrl_avatar_shadow->setValue(0);
+		// </FS:Ansariel>
 	}
 
 	// disabled reflections
@@ -2079,6 +2105,11 @@ void LLFloaterPreference::disableUnavailableSettings()
 		//deferred needs AvatarVP, disable deferred
 		ctrl_shadows->setEnabled(FALSE);
 		ctrl_shadows->setValue(0);
+
+		// <FS:Ansariel> Options for Chalice Yao's simple avatar shadows via Marine Kelley
+		ctrl_avatar_shadow->setEnabled(FALSE);
+		ctrl_avatar_shadow->setValue(0);
+		// </FS:Ansariel>
 		
 		ctrl_ssao->setEnabled(FALSE);
 		ctrl_ssao->setValue(FALSE);
diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp
index 1109cd1020..83b8290f6b 100644
--- a/indra/newview/quickprefs.cpp
+++ b/indra/newview/quickprefs.cpp
@@ -335,6 +335,7 @@ BOOL FloaterQuickPrefs::postBuild()
 		mCtrlUseSSAO = getChild<LLCheckBoxCtrl>("UseSSAO");
 		mCtrlUseDoF = getChild<LLCheckBoxCtrl>("UseDepthofField");
 		mCtrlShadowDetail = getChild<LLComboBox>("ShadowDetail");
+		mCtrlAvatarShadowDetail = getChild<LLComboBox>("AvatarShadowDetail");
 		mCtrlReflectionDetail = getChild<LLComboBox>("Reflections");
 // <FS:CR> FIRE-9630 - Vignette UI controls
 		mSpinnerVignetteX = getChild<LLSpinCtrl>("VignetteSpinnerX");
@@ -768,6 +769,7 @@ void FloaterQuickPrefs::refreshSettings()
 
 	mCtrlShadowDetail->setEnabled(enabled);
 
+	mCtrlAvatarShadowDetail->setEnabled(enabled && mCtrlShadowDetail->getValue().asInteger() > 0);
 
 	// if vertex shaders off, disable all shader related products
 	if (!LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"))
@@ -783,6 +785,9 @@ void FloaterQuickPrefs::refreshSettings()
 
 		mCtrlShadowDetail->setEnabled(FALSE);
 		mCtrlShadowDetail->setValue(0);
+
+		mCtrlAvatarShadowDetail->setEnabled(FALSE);
+		mCtrlAvatarShadowDetail->setValue(0);
 		
 		mCtrlUseSSAO->setEnabled(FALSE);
 		mCtrlUseSSAO->setValue(FALSE);
@@ -804,6 +809,9 @@ void FloaterQuickPrefs::refreshSettings()
 		mCtrlShadowDetail->setEnabled(FALSE);
 		mCtrlShadowDetail->setValue(0);
 		
+		mCtrlAvatarShadowDetail->setEnabled(FALSE);
+		mCtrlAvatarShadowDetail->setValue(0);
+
 		mCtrlUseSSAO->setEnabled(FALSE);
 		mCtrlUseSSAO->setValue(FALSE);
 
@@ -820,7 +828,10 @@ void FloaterQuickPrefs::refreshSettings()
 	{
 		mCtrlShadowDetail->setEnabled(FALSE);
 		mCtrlShadowDetail->setValue(0);
-		
+
+		mCtrlAvatarShadowDetail->setEnabled(FALSE);
+		mCtrlAvatarShadowDetail->setValue(0);
+
 		mCtrlUseSSAO->setEnabled(FALSE);
 		mCtrlUseSSAO->setValue(FALSE);
 
@@ -843,6 +854,9 @@ void FloaterQuickPrefs::refreshSettings()
 	{
 		mCtrlShadowDetail->setEnabled(FALSE);
 		mCtrlShadowDetail->setValue(0);
+
+		mCtrlAvatarShadowDetail->setEnabled(FALSE);
+		mCtrlAvatarShadowDetail->setValue(0);
 	}
 
 	// disabled reflections
@@ -858,6 +872,10 @@ void FloaterQuickPrefs::refreshSettings()
 		//deferred needs AvatarVP, disable deferred
 		mCtrlShadowDetail->setEnabled(FALSE);
 		mCtrlShadowDetail->setValue(0);
+
+		mCtrlAvatarShadowDetail->setEnabled(FALSE);
+		mCtrlAvatarShadowDetail->setValue(0);
+
 		
 		mCtrlUseSSAO->setEnabled(FALSE);
 		mCtrlUseSSAO->setValue(FALSE);
diff --git a/indra/newview/quickprefs.h b/indra/newview/quickprefs.h
index 186e219c86..9374c14d0c 100644
--- a/indra/newview/quickprefs.h
+++ b/indra/newview/quickprefs.h
@@ -127,6 +127,7 @@ private:
 	LLCheckBoxCtrl*		mCtrlUseSSAO;
 	LLCheckBoxCtrl*		mCtrlUseDoF;
 	LLComboBox*			mCtrlShadowDetail;
+	LLComboBox*			mCtrlAvatarShadowDetail;
 	LLComboBox*			mCtrlReflectionDetail;
 	
 	// <FS:CR> FIRE-9630 Vignette UI controls
diff --git a/indra/newview/skins/default/xui/de/floater_phototools.xml b/indra/newview/skins/default/xui/de/floater_phototools.xml
index 7ce8fcd87d..39b425eda6 100644
--- a/indra/newview/skins/default/xui/de/floater_phototools.xml
+++ b/indra/newview/skins/default/xui/de/floater_phototools.xml
@@ -112,7 +112,16 @@
 					<combo_box.item label="Sonne/Mond" name="1"/>
 					<combo_box.item label="Sonne/Mond + Projektoren" name="2"/>
 				</combo_box>
-			</panel>		
+				<text name="avatar_shadows_label">
+					Avatar-Schatten:
+				</text>
+				<combo_box name="AvatarShadowDetail">
+					<combo_box.item label="Keine" name="0"/>
+					<combo_box.item label="Vereinfacht" name="1"/>
+					<combo_box.item label="Optimiert" name="2"/>
+					<combo_box.item label="Komplex" name="3"/>
+				</combo_box>
+			</panel>
 
 			<panel name="P_Shadow_Res">
 				<text name="T_Shadow_Res" tool_tip="Schatten-Qualität: Eine besonders wichtige Einstellung. Sie legt die Qualität der Schatten fest. Zudem ist sie sehr recheninstensiv und beansprucht den Computer dementsprechend. Sofern kein Shooting stattfindet, sollte dieser Wert möglichst klein sein. Während den Vorbereitungen zu einem Shooting empfiehlt sich, den Wert auf 1.0 zu setzen. Anschließend den Regler langsam nach rechts bewegen, um den Wert zu erhöhen. Dabei sollte die Framerate im Auge behalten werden. Es ist hilfreich, das Statistik-Fenster hierfür zu aktivieren. HINWEIS: Wird die Einstellung zu hoch gewählt oder zu schnell bewegt, kann dies zum Absturz des Viewers führen!">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index 3a9168b4fc..e36b7e657d 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -42,6 +42,15 @@
 			<combo_box.item label="Sonne/Mond" name="1"/>
 			<combo_box.item label="Sonne/Mond + Projektoren" name="2"/>
 		</combo_box>
+		<text name="avatar_shadows_label">
+			Avatar-Schatten:
+		</text>
+		<combo_box name="AvatarShadowDetail">
+			<combo_box.item label="Keine" name="0"/>
+			<combo_box.item label="Vereinfacht" name="1"/>
+			<combo_box.item label="Optimiert" name="2"/>
+			<combo_box.item label="Komplex" name="3"/>
+		</combo_box>
 		<text name="reflection_label">
 			Wasserreflexionen:
 		</text>
diff --git a/indra/newview/skins/default/xui/en/floater_phototools.xml b/indra/newview/skins/default/xui/en/floater_phototools.xml
index 57ff8b1128..7efe5b8fed 100644
--- a/indra/newview/skins/default/xui/en/floater_phototools.xml
+++ b/indra/newview/skins/default/xui/en/floater_phototools.xml
@@ -679,7 +679,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="90"
+			 height="60"
 			 border_visible="true"
 			 background_visible="true">
 				<check_box
@@ -691,7 +691,7 @@
 				 layout="topleft"
 				 left="5"
 				 name="RenderDeferred"
-				 top_pad="10"
+				 top_pad="5"
 				 tool_tip="This will enable shadows from the Sun and Moon and in-world light sources. It will also allow you to turn on Depth of Field and other graphic features. Basically you need to turn this on to see most of the 'eye candy' in-world. If you cannot enable this feature or see its effect, first ensure both Atmospheric Shaders and Basic Shaders are enabled in tab 'WL'."
 				 width="240">
 				</check_box>
@@ -703,13 +703,13 @@
 				 left="5"
 				 name="LocalLights"
 				 tool_tip="This will turn on all in-world lights. If you disable this feature, light from Sun and Moon will still appear. Useful when you wish to eliminate SIM lighting and use only the Sun and Moon light."
-				 top_pad="5"
+				 top_pad="2"
 				 width="240"/>
 				<check_box
 				 follows="top|left"
 				 layout="topleft"
 				 left="5"
-				 top_pad="5"
+				 top_pad="2"
 				 height="16"
 				 label="Enable Attached Lights (Face Lights)"
 				 tool_tip="This will enable any lights, such as face lights, avatars have attached to them. Useful for turning off facelights when necessary."
@@ -730,7 +730,7 @@
 			 top_pad="5"
 			 left="4"
 			 width="275"
-			 height="33"
+			 height="65"
 			 border_visible="true"
 			 background_visible="true">
 				<text
@@ -768,7 +768,45 @@
 					 name="2"
 					 value="2"/>
 				</combo_box>
-			</panel>		
+				<text
+				 type="string"
+				 length="1"
+				 top_pad="7"
+				 follows="top|left"
+				 height="16"
+				 width="50"
+				 word_wrap="true"
+				 layout="topleft"
+				 left="5"
+				 name="avatar_shadows_label">
+					Avatar Shadows:
+				</text>
+				<combo_box
+				 control_name="FSSimpleAvatarShadows"
+				 height="20"
+				 layout="topleft"
+				 left_pad="10"
+				 top_delta="3"
+				 name="AvatarShadowDetail"
+				 width="200">
+					<combo_box.item
+					 label="None"
+					 name="0"
+					 value="0"/>
+					<combo_box.item
+					 label="Simplified"
+					 name="1"
+					 value="1"/>
+					<combo_box.item
+					 label="Optimized"
+					 name="2"
+					 value="2"/>
+					<combo_box.item
+					 label="Complex"
+					 name="3"
+					 value="3"/>
+				</combo_box>
+			</panel>
 
 			<panel
 			 name="P_Shadow_Res"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 835f84908b..e04cc4a7f5 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -313,7 +313,7 @@
         <text
          type="string"
          length="1"
-         top_pad="8"
+         top_pad="4"
          follows="top|left"
          height="12"
          width="110"
@@ -350,7 +350,46 @@
         <text
          type="string"
          length="1"
-         top_pad="8"
+         top_pad="4"
+         follows="top|left"
+         height="12"
+         width="110"
+         word_wrap="true"
+         layout="topleft"
+         left_delta="-5"
+         name="avatar_shadows_label">
+          Avatar Shadows:
+        </text>
+        <combo_box
+         control_name="FSSimpleAvatarShadows"
+         height="23"
+         layout="topleft"
+         left_delta="5"
+         top_pad="3"
+         name="AvatarShadowDetail"
+         width="150">
+          <combo_box.item
+           label="None"
+           name="0"
+           value="0"/>
+          <combo_box.item
+           label="Simplified"
+           name="1"
+           value="1"/>
+          <combo_box.item
+           label="Optimized"
+           name="2"
+           value="2"/>
+          <combo_box.item
+           label="Complex"
+           name="3"
+           value="3"/>
+        </combo_box>
+
+        <text
+         type="string"
+         length="1"
+         top_pad="4"
          follows="top|left"
          height="12"
          width="110"
@@ -394,7 +433,7 @@
         <text
          type="string"
          length="1"
-         top_pad="8"
+         top_pad="4"
          follows="top|left"
          height="12"
          width="170"
diff --git a/indra/newview/skins/starlight/xui/en/floater_phototools.xml b/indra/newview/skins/starlight/xui/en/floater_phototools.xml
index 6989d98297..2396de83af 100644
--- a/indra/newview/skins/starlight/xui/en/floater_phototools.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_phototools.xml
@@ -710,7 +710,7 @@
 			 top_pad="0"
 			 left="4"
 			 width="275"
-			 height="89"
+			 height="74"
 			 border_visible="true"
 			 bevel_style="none"
 			 bg_alpha_color="DkGray_66"
@@ -763,7 +763,7 @@
 			 top_pad="0"
 			 left="4"
 			 width="275"
-			 height="35"
+			 height="65"
 			 border_visible="true"
 			 bevel_style="none"
 			 bg_alpha_color="DkGray_66"
@@ -803,7 +803,45 @@
 					 name="2"
 					 value="2"/>
 				</combo_box>
-			</panel>		
+				<text
+				 type="string"
+				 length="1"
+				 top_pad="7"
+				 follows="top|left"
+				 height="16"
+				 width="50"
+				 word_wrap="true"
+				 layout="topleft"
+				 left="5"
+				 name="avatar_shadows_label">
+					Avatar Shadows:
+				</text>
+				<combo_box
+				 control_name="FSSimpleAvatarShadows"
+				 height="20"
+				 layout="topleft"
+				 left_pad="10"
+				 top_delta="3"
+				 name="AvatarShadowDetail"
+				 width="200">
+					<combo_box.item
+					 label="None"
+					 name="0"
+					 value="0"/>
+					<combo_box.item
+					 label="Simplified"
+					 name="1"
+					 value="1"/>
+					<combo_box.item
+					 label="Optimized"
+					 name="2"
+					 value="2"/>
+					<combo_box.item
+					 label="Complex"
+					 name="3"
+					 value="3"/>
+				</combo_box>
+			</panel>
 
 			<panel
 			 name="P_Shadow_Res"
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml b/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml
index 386fe59214..f269894f31 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_phototools.xml
@@ -710,7 +710,7 @@
 			 top_pad="0"
 			 left="4"
 			 width="275"
-			 height="89"
+			 height="74"
 			 border_visible="true"
 			 bevel_style="none"
 			 bg_alpha_color="SL-CustomBackground_Light"
@@ -763,7 +763,7 @@
 			 top_pad="0"
 			 left="4"
 			 width="275"
-			 height="35"
+			 height="65"
 			 border_visible="true"
 			 bevel_style="none"
 			 bg_alpha_color="SL-CustomBackground_Light"
@@ -803,7 +803,45 @@
 					 name="2"
 					 value="2"/>
 				</combo_box>
-			</panel>		
+				<text
+				 type="string"
+				 length="1"
+				 top_pad="7"
+				 follows="top|left"
+				 height="16"
+				 width="50"
+				 word_wrap="true"
+				 layout="topleft"
+				 left="5"
+				 name="avatar_shadows_label">
+					Avatar Shadows:
+				</text>
+				<combo_box
+				 control_name="FSSimpleAvatarShadows"
+				 height="20"
+				 layout="topleft"
+				 left_pad="10"
+				 top_delta="3"
+				 name="AvatarShadowDetail"
+				 width="200">
+					<combo_box.item
+					 label="None"
+					 name="0"
+					 value="0"/>
+					<combo_box.item
+					 label="Simplified"
+					 name="1"
+					 value="1"/>
+					<combo_box.item
+					 label="Optimized"
+					 name="2"
+					 value="2"/>
+					<combo_box.item
+					 label="Complex"
+					 name="3"
+					 value="3"/>
+				</combo_box>
+			</panel>
 
 			<panel
 			 name="P_Shadow_Res"