diff --git a/indra/newview/app_settings/keys.ini b/indra/newview/app_settings/keys.ini
index bf9c94a09..eebb5dc33 100644
--- a/indra/newview/app_settings/keys.ini
+++ b/indra/newview/app_settings/keys.ini
@@ -52,6 +52,7 @@ FIRST_PERSON	F		SHIFT		toggle_fly
 
 FIRST_PERSON	SPACE		NONE		stop_moving
 FIRST_PERSON	ENTER		NONE		start_chat
+FIRST_PERSON	DIVIDE		NONE		start_gesture
 FIRST_PERSON	/		NONE		start_gesture
 
 FIRST_PERSON	LEFT		SHIFT		slide_left
@@ -89,6 +90,7 @@ THIRD_PERSON	F		SHIFT		toggle_fly
 
 THIRD_PERSON	SPACE		NONE		stop_moving
 THIRD_PERSON	ENTER		NONE		start_chat
+THIRD_PERSON	DIVIDE		NONE		start_gesture
 THIRD_PERSON	/		NONE		start_gesture
 
 THIRD_PERSON	LEFT		NONE		turn_left
@@ -201,6 +203,7 @@ EDIT		S		NONE		move_backward
 EDIT		E		NONE		spin_over
 EDIT		C		NONE		spin_under
 EDIT		ENTER		NONE		start_chat
+EDIT		DIVIDE		NONE		start_gesture
 EDIT		/		NONE		start_gesture
 EDIT		PAD_ENTER	NONE		start_chat
 EDIT		PAD_DIVIDE	NONE		start_gesture
@@ -330,6 +333,7 @@ SITTING		PAD_ENTER	CTL_ALT_SHIFT	start_chat
 SITTING		PAD_DIVIDE	CTL_ALT_SHIFT	start_gesture
 
 SITTING		ENTER		NONE		start_chat
+SITTING		DIVIDE		NONE		start_gesture
 SITTING		/		NONE		start_gesture
 
 # Avatar editing camera controls
@@ -346,6 +350,7 @@ EDIT_AVATAR	DOWN		NONE		edit_avatar_move_backward
 EDIT_AVATAR	PGUP		NONE		edit_avatar_spin_over
 EDIT_AVATAR	PGDN		NONE		edit_avatar_spin_under
 EDIT_AVATAR	ENTER		NONE		start_chat
+EDIT_AVATAR	DIVIDE		NONE		start_gesture
 EDIT_AVATAR	/		NONE		start_gesture
 EDIT_AVATAR	PAD_LEFT	NONE		edit_avatar_spin_cw
 EDIT_AVATAR	PAD_RIGHT	NONE		edit_avatar_spin_ccw
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 66a8d7e72..88a3361fc 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -226,11 +226,12 @@ void LLPrefsAscentSys::refreshValues()
     mCmdMapToKeepPos            = gSavedSettings.getBOOL("AscentMapToKeepPos");
     mCmdLineTP2                 = gSavedSettings.getString("AscentCmdLineTP2");
 
-    //Privacy -----------------------------------------------------------------------------
+    //Security ----------------------------------------------------------------------------
     mBroadcastViewerEffects		= gSavedSettings.getBOOL("BroadcastViewerEffects");
     mDisablePointAtAndBeam		= gSavedSettings.getBOOL("DisablePointAtAndBeam");
     mPrivateLookAt				= gSavedSettings.getBOOL("PrivateLookAt");
     mShowLookAt					= gSavedSettings.getBOOL("AscentShowLookAt");
+	mQuietSnapshotsToDisk		= gSavedSettings.getBOOL("QuietSnapshotsToDisk");
     mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
     mDisableClickSit			= gSavedSettings.getBOOL("DisableClickSit");
     mDisplayScriptJumps			= gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps");
@@ -330,11 +331,12 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setBOOL("AscentMapToKeepPos",            mCmdMapToKeepPos);
     gSavedSettings.setString("AscentCmdLineTP2",			mCmdLineTP2);
 
-    //Privacy -----------------------------------------------------------------------------
+    //Security ----------------------------------------------------------------------------
     gSavedSettings.setBOOL("BroadcastViewerEffects",        mBroadcastViewerEffects);
     gSavedSettings.setBOOL("DisablePointAtAndBeam",         mDisablePointAtAndBeam);
     gSavedSettings.setBOOL("PrivateLookAt",                 mPrivateLookAt);
     gSavedSettings.setBOOL("AscentShowLookAt",              mShowLookAt);
+    gSavedSettings.setBOOL("QuietSnapshotsToDisk",			mQuietSnapshotsToDisk);
     gSavedSettings.setBOOL("RevokePermsOnStandUp",          mRevokePermsOnStandUp);
     gSavedSettings.setBOOL("DisableClickSit",               mDisableClickSit);
     gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps);
diff --git a/indra/newview/skins/default/xui/en-us/panel_friends.xml b/indra/newview/skins/default/xui/en-us/panel_friends.xml
index 28aa426e1..da9dec4ef 100644
--- a/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -1,81 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="true" name="friends">
 	<string name="Multiple">Multiple friends...</string>
-	<scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
-	    follows="left|top|bottom|right" left="10" multi_select="true"
-	    name="friend_list" right="-100" search_column="1"
-	    tool_tip="Hold shift or control while clicking to select multiple friends"
-	    top="-40">
-		<column image="ff_online_status_button.tga" name="icon_online_status"
-		    tool_tip="Online status" width="20" />
-		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
-		<column image="ff_visible_online_button.tga" name="icon_visible_online"
-		    tool_tip="Friend can see when you're online" width="20" />
-		<column image="ff_visible_map_button.tga" name="icon_visible_map"
-		    tool_tip="Friend can locate you on the map" width="20" />
-		<column image="ff_edit_mine_button.tga" name="icon_edit_mine"
-		    tool_tip="Friend can edit, delete or take objects" width="20" />
-    	<column image="ff_visible_online_button.tga" name="icon_visible_online_theirs"
-		    tool_tip="You can see when they are online (only updates on login)" width="20" />
-   		<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
-		    tool_tip="You can locate them on the map" width="20" />
-		<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
-		    tool_tip="You can edit this friend's objects" width="20" />
-		<column name="friend_last_update_generation" width="0" />
+	<scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true" follows="left|top|bottom|right" left="10" multi_select="true"
+	    name="friend_list" right="-100" search_column="1" tool_tip="Hold shift or control while clicking to select multiple friends" top="-40">
+		<column image="ff_online_status_button.tga" name="icon_online_status" tool_tip="Online status" width="20"/>
+		<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name"/>
+		<column image="ff_visible_online_button.tga" name="icon_visible_online" tool_tip="Friend can see when you're online" width="20"/>
+		<column image="ff_visible_map_button.tga" name="icon_visible_map" tool_tip="Friend can locate you on the map" width="20"/>
+		<column image="ff_edit_mine_button.tga" name="icon_edit_mine" tool_tip="Friend can edit, delete or take objects" width="20"/>
+		<column image="ff_visible_online_button.tga" name="icon_visible_online_theirs" tool_tip="You can see when they are online (only updates on login)" width="20"/>
+   		<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs" tool_tip="You can locate them on the map" width="20"/>
+		<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" tool_tip="You can edit this friend's objects" width="20"/>
+		<column name="friend_last_update_generation" width="0"/>
 	</scroll_list>
-	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" 
-		name="friends" width="110">
-		Contact Group:
-	</text-->
-	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-		name="friends" width="110">
-		Contact Search:
-	</text-->
-	<!--combo_box allow_text_entry="false" enabled="true" follows="right|top"
-		bottom_delta="20" height="18" hidden="false" left="-255" max_chars="20" mouse_opaque="true"
-		tool_tip="Buddy group" name="buddy_group_combobox" width="130">
-		<combo_item type="string" length="20" enabled="true" name="All" value="All">
-			All
-		</combo_item>
+	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="friends" width="110">Contact Group:</text-->
+	<!--combo_box allow_text_entry="false" enabled="true" follows="right|top" bottom_delta="20" height="18" hidden="false" left="-255" max_chars="20" tool_tip="Buddy group" name="buddy_group_combobox" width="130">
+		<combo_item type="string" length="20" enabled="true" name="All" value="All">All</combo_item>
 	</combo_box-->
-	<search_editor bottom_delta="-40" enabled="true" follows="left|top" font="SansSerif"
-		height="18" left_delta="0" name="buddy_search_lineedit" label="Type here to search"
-		tool_tip="The friend name you want to search for" width="160" />
-	<button bottom_delta="-3" follows="top|right" height="22" label="0"
-		left="-120" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info"
-		width="22" />
-	<pad bottom="-7" height="0" left="-90" width="1" />
-	<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact"
-		left_delta="0" name="assign_btn" tool_tip="Assign a friend to a Contact Group"
-		width="80" /-->
-	<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call"
-	    left_delta="0" name="im_btn" tool_tip="Open Instant Message session"
-	    width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22" label="Profile"
-	    left_delta="0" name="profile_btn"
-	    tool_tip="Show picture, groups, and other information" width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
-	    left_delta="0" name="offer_teleport_btn"
-	    tool_tip="Offer this friend a teleport to your current location" width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
-	    left_delta="0" name="pay_btn"
-	    tool_tip="Give in-world money ([CURRENCY]) to this friend" width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
-	    left_delta="0" name="remove_btn"
-	    tool_tip="Remove this person from your friends list" width="80" />
-	<button bottom_delta="-25" follows="top|right" height="22" label="Add..."
-	    left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
-	    width="80" />
-	<text bottom_delta="-35" follows="right|top" font="SansSerif" height="32" left_delta="0" name="friends" width="95">
-		Online:
-    </text>
-	<text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="f_num" width="95">
-		0000
-    </text>
-	<text bottom_delta="-15" follows="right|top" font="SansSerif" height="32" left_delta="0" name="sel" width="95">
-		Selected:
-    </text>
-	<text bottom_delta="0" follows="right|top" font="SansSerif" height="32" left_delta="55" name="s_num" width="95">
-		0000
-    </text>		 
+	<text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text>
+	<search_editor bottom_delta="0" enabled="true" follows="left|top" font="SansSerif" height="18" left="90" name="buddy_search_lineedit" label="Type here to search" tool_tip="The friend name you want to search for" width="160"/>
+	<button bottom_delta="0" follows="top|right" height="22" label="0" left="-120" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/>
+	<pad bottom="-7" height="0" left="-90" width="1"/>
+	<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
+	<button bottom_delta="-25" follows="top|right" height="22" label="IM/Call" name="im_btn" tool_tip="Open Instant Message session" width="80"/>
+	<button bottom_delta="-25" follows="top|right" height="22" label="Profile" name="profile_btn" tool_tip="Show picture, groups, and other information" width="80"/>
+	<button bottom_delta="-25" follows="top|right" height="22" label="Teleport..." name="offer_teleport_btn" tool_tip="Offer this friend a teleport to your current location" width="80" />
+	<button bottom_delta="-25" follows="top|right" height="22" label="Pay..." name="pay_btn" tool_tip="Give in-world money ([CURRENCY]) to this friend" width="80"/>
+	<button bottom_delta="-25" follows="top|right" height="22" label="Remove..." name="remove_btn" tool_tip="Remove this person from your friends list" width="80"/>
+	<button bottom_delta="-25" follows="top|right" height="22" label="Add..." name="add_btn" tool_tip="Offer friendship to a resident" width="80"/>
+	<text bottom_delta="-35" follows="right|top" height="32" name="friends" width="95">Online:</text>
+	<text bottom_delta="-15" follows="right|top" height="32" name="f_num" width="95">0000</text>
+	<text bottom_delta="-15" follows="right|top" height="32" name="sel" width="95">Selected:</text>
+	<text bottom_delta="0" follows="right|top" height="32" left_delta="55" name="s_num" width="95">0000</text>		 
 </panel>
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 387517415..117457d1e 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
@@ -81,6 +81,7 @@
       <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" follows="top" initial_value="true" label="Disable Point At And Beam" tool_tip="Don't point at or show your edit beam when selecting an object." name="disable_point_at_and_beams_check"/>
       <check_box bottom_delta="-20" control_name="PrivateLookAt" follows="top" initial_value="false" label="Do not Look At objects (defeats ShowLookAt)" tool_tip="Turns off broadcasting headturns and lookat beacons for yourself." name="private_look_at_check"/>
       <check_box bottom_delta="-20" control_name="AscentShowLookAt" follows="top" initial_value="false" label="Show others' LookAt beacons" tool_tip="Shows you where others are looking." name="show_look_at_check"/>
+      <check_box bottom_delta="-20" control_name="QuietSnapshotsToDisk" follows="top" initial_value="false" label="Quiet Snapshots to Disk" tool_tip="Doesn't make a camera sound nor alert everyone when you take a snapshot to your computer" name="quiet_snapshots_check"/>
       <check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" follows="top" initial_value="false" label="On standing up, revoke perms for the object your avatar was sitting on" tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately." name="revoke_perms_on_stand_up_check"/>
       <check_box bottom_delta="-20" control_name="DisableClickSit" follows="top" initial_value="false" label="Disable click-to-sit objects" tool_tip="Some griefer tools rely on forcing or tricking you to click on an object that will make you sit, giving the object automatic permissions to trigger animations amongst other things. This will disable llSitTarget - It does mean that you will need to select 'Sit' on poseballs and furniture." name="disable_click_sit_check"/>
       <check_box bottom_delta="-20" follows="top" initial_value="false" label="Display Total Script Count changes:" name="totalscriptjumps" control_name="AscentDisplayTotalScriptJumps" tool_tip="Displays script count changes in your region, dependant on the threshold you choose to the right."/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 183d4d69e..db6b6c9ab 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -39,7 +39,7 @@
 	<text bottom="-331" height="18" left="10" name="crash_report_textbox">Crash reports:</text>
 	<text bottom="-363" height="18" name="language_textbox">Language:</text>
 	<text bottom_delta="6" follows="top" height="18" left_delta="243" name="language_textbox2">(Requires restart for full effect)
-					*Uses English UI</text>
+          *Uses English UI</text>
 	<combo_box allow_text_entry="true" bottom="-361" follows="top" height="16" left="103" name="language_combobox" max_chars="32" width="140">
 		<combo_item name="System Default Language" value="default">System Default</combo_item>
 		<combo_item name="English" value="en-us">English</combo_item>		
diff --git a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
index 200e4e44f..9ea1d591f 100644
--- a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
@@ -18,7 +18,7 @@
 				<button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
 				<text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
 				<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
-				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
+				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
 				<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
 			</panel>
 		</layout_panel>