diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index bca168d43..4e74783ce 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -53,6 +53,12 @@
 				tool_tip="Lets you fly in locations you shouldn't be allowed to. Use at your own risk - Just because you can doesn't mean you should."
 				mouse_opaque="true" name="always_fly_check" radio_style="false"
 				width="400" />	
+			<check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
+				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+				label="Disable camera minimum distance" left="10"
+				tool_tip="Allows the camera to get reeeaaally close to things."
+				mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
+				width="400" />
 			<!--<check_box bottom_delta="-20" control_name="AscentPowerfulWizard" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
 				label="Enable Power User functionality" left="10"
diff --git a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
index a451d36ba..b76a304d9 100644
--- a/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
+++ b/indra/newview/skins/default/xui/en-us/wlfPanel_AdvSettings_expanded.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel bg_visible="false" border="false" border_visible="false" bottom="1"
-     follows="left|bottom" height="198" left="0" name="Adv_Settings"
+     follows="left|bottom" height="220" left="0" name="Adv_Settings"
      use_bounding_rect="true" width="220" >
-	<panel bottom="0" filename="panel_bg_tab.xml" height="198" left="0" width="205" />
-	<slider bottom="175" left="10" control_name="RenderFarClip"
+	<panel bottom="0" filename="panel_bg_tab.xml" height="185" left="0" width="205" />
+	<slider bottom="160" left="10" control_name="RenderFarClip"
 		decimal_digits="0" enabled="true" follows="left|bottom" height="20"
 		increment="8" label="Draw Dist.:" can_edit_text="true"
 		label_width="55" max_val="1024" min_val="24" mouse_opaque="true"