diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6972365d7..0b4e7c630 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11046,7 +11046,7 @@
       <key>Comment</key>
       <string>Maximum size of a single node's vertex data (in KB).</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 1bed779ff..0c834da53 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -2201,6 +2201,10 @@ void LLFloaterIMPanel::sendMsg()
 				}
 			}
 
+			if (utf8text.find("/ME'") == 0 || utf8text.find("/ME ") == 0)	//Allow CAPSlock /me
+			{
+				utf8text.replace(1, 2, "me");
+			}
 			std::string prefix = utf8text.substr(0, 4);
 			if (prefix != "/me " && prefix != "/me'")
 				if (mRPMode) utf8text = "[[" + utf8text + "]]";
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 7d68217c0..e12b71794 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -1,86 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
-     can_minimize="true" can_resize="true" default_tab_group="1"
-	 follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
-     min_height="155" min_width="345" mouse_opaque="true" name="im_floater"
-     rect_control="" title="(unknown)" width="501">
-	<string name="ringing">
-		Calling...
-	</string>
-	<string name="answering">
-		Connecting...
-	</string>
-	<string name="connected">
-		Connected, click End Call to hang up
-	</string>
-	<string name="hang_up">
-		Call ended
-	</string>
-	<string name="inventory_item_offered">
-		Inventory item offered
-	</string>
-	<string name="voice_icon">
-		icn_voice-pvtfocus.tga
-	</string>
-	<string name="title_string">
-		Instant Message with [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] is typing...
-	</string>
-	<string name="session_start_string">
-		Starting session with [NAME] please wait.
-	</string>
-	<string name="default_text_label">
-		Click here to instant message.
-	</string>
-	<string name="unavailable_text_label">
-		Text chat is not available for this call.
-	</string>
-	<button bottom="-40" follows="left|top" height="20" label="Profile" left="5"
-	     name="profile_callee_btn" width="80" />
-	<button bottom="-40" follows="left|top" halign="center" height="20" label="Teleport" left_delta="80"
-		 name="profile_tele_btn" width="80" />
-  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="80"
-          name="history_btn" visible="true" width="80" />
-  <check_box bottom="-40" follows="left|top" halign="center" height="20" left_delta="80"
-			     name="rp_mode" pad_right="10" >
-    RP Mode
-	</check_box>
-	<button bottom="-40" follows="left|top" halign="right" height="20"
-	     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-	     label="Call" left_delta="80" name="start_call_btn" width="53" />
-	<button bottom="-40" follows="left|top" halign="right" height="20"
-	     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
-	     label="End" left_delta="0" name="end_call_btn" pad_right="10"
-	     visible="false" width="53" />
-	<panel border="false" bottom="-37" follows="left|top" height="20"
-	     left_delta="50" name="speaker_controls" width="100">
-		<volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
-		     left_delta="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="56" />
-		<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
-		     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
-		     name="mute_btn" tool_tip="Mute voice" width="25" />
+<floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1"
+	follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
+	min_height="155" min_width="345" name="im_floater" rect_control="" title="(unknown)" width="501">
+	<string name="ringing">Calling...</string>
+	<string name="answering">Connecting...</string>
+	<string name="connected">Connected, click End Call to hang up</string>
+	<string name="hang_up">Call ended</string>
+	<string name="inventory_item_offered">Inventory item offered</string>
+	<string name="voice_icon">icn_voice-pvtfocus.tga</string>
+	<string name="title_string">Instant Message with [NAME]</string>
+	<string name="typing_start_string">[NAME] is typing...</string>
+	<string name="session_start_string">Starting session with [NAME] please wait.</string>
+	<string name="default_text_label">Click here to instant message.</string>
+	<string name="unavailable_text_label">Text chat is not available for this call.</string>
+	<button bottom="-40" height="20" label="Profile" left="5" name="profile_callee_btn" width="80"/>
+	<button bottom="-40" height="20" label="Teleport" left_delta="80" name="profile_tele_btn" width="80"/>
+	<button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="80" name="history_btn" visible="true" width="80"/>
+	<check_box bottom="-40" follows="top" halign="center" height="20" left_delta="80" name="rp_mode">RP Mode</check_box>
+	<button bottom="-40" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="53"/>
+	<button bottom="-40" follows="top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End" name="end_call_btn" visible="false" width="53"/>
+	<panel border="false" bottom="-37" follows="left|top" height="20" left_delta="50" name="speaker_controls" width="100">
+		<volume_slider bottom="0" follows="bottom" height="15" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="56"/>
+		<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
 	</panel>
-	<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-	     bottom="30" embedded_items="false" enabled="false"
-		 follows="left|top|right|bottom" font="SansSerif" height="221" left="7"
-	     max_length="2147483647" mouse_opaque="true" name="im_history"
-	     text_color="ChatHistoryTextColor"
-       track_bottom="true" 
-	     text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" />
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
-	     follows="left|right|bottom" font="SansSerif" height="20"
-		 label="Click here to instant message" left="7" max_length="2147483647"
-	     mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-	     select_on_focus="false" tab_group="1" width="423" spell_check="true" />
-	<button bottom="7" follows="right|bottom" font="SansSerif" halign="center" height="20"
-		 label="Send" left="435" mouse_opaque="true" name="send_btn"
-	     scale_image="true" width="60" />
-	<string name="live_help_dialog">
-		*** Welcome to Help Request *** 
+	<text_editor bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"	enabled="false" follows="left|top|right|bottom" height="221" left="7" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="487"/>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" follows="left|right" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" tab_group="1" width="433" spell_check="true"/>
+	<button bottom="7" height="20" label="Send" left="-56" name="send_btn" scale_image="true" width="50"/>
+	<string name="live_help_dialog">*** Welcome to Help Request *** 
 Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 
 If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
--=-=- Response times will vary, especially during peak times -=-=-
-	</string>
+-=-=- Response times will vary, especially during peak times -=-=-</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml b/indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
index 973c09e25..cfb2857cc 100644
--- a/indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_perm_prefs.xml
@@ -1,42 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="perm prefs" title="Default Upload Permissions"
-     width="315" height="180" rect_control="FloaterPermPrefsRect" 
-     can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false" >
-    <panel label="Permissions" name="permissions" width="315" height="120" left="10"
-        border="false" bottom="-140" enabled="true" follows="left|top|right|bottom"
-        mouse_opaque="true" >
-    	<button name="help" label="?" label_selected="?" halign="center" follows="left"
-			     bottom_delta="-25" height="18" width="22" left="260" font="SansSerif" />
-    	<check_box bottom_delta="0" follows="left|top" width="106" height="16" left="10"
-    	     initial_value="false" label="Share with group" 
-    	     mouse_opaque="true" radio_style="false" font="SansSerifSmall" 
-    	     name="share_with_group" control_name="ShareWithGroup" />
-    	<check_box bottom_delta="-32" follows="left|top" width="130" height="16"
-    	     initial_value="false" label="Allow anyone to copy" left="10"
-    	     mouse_opaque="true" radio_style="false" font="SansSerifSmall" 
-    	     name="everyone_copy" control_name="EveryoneCopy" />
-    	<text bottom_delta="-26" bg_visible="false" border_drop_shadow_visible="false" 
-    	     drop_shadow_visible="true" follows="left|top" border_visible="false"
-    	     font="SansSerifSmall" h_pad="0" halign="left" left="10"
-    	     mouse_opaque="true" name="NextOwnerLabel" v_pad="0" width="190" height="10" >
-    		Next owner can:
-    	</text>
-    	<check_box bottom_delta="-30" follows="left|top" width="78" height="16"
-    	     radio_style="false" font="SansSerifSmall" 
-    	     initial_value="false" label="Modify" left="10" mouse_opaque="true"
-    	     name="next_owner_modify" control_name="NextOwnerModify" />
-    	<check_box bottom_delta="0" follows="left|top" width="88" height="16"
-    	     left_delta="78" radio_style="false" font="SansSerifSmall" 
-    	     initial_value="false" label="Copy" mouse_opaque="true"
-    	     name="next_owner_copy" control_name="NextOwnerCopy" />
-    	<check_box bottom_delta="0" follows="left|top" width="106" height="16"
-    	     left_delta="88" radio_style="false" font="SansSerifSmall" 
-    	     initial_value="true" label="Resell/Give away" mouse_opaque="true" enabled="false" 
-    	     name="next_owner_transfer" control_name="NextOwnerTransfer" />
+<floater name="perm prefs" title="Default Upload Permissions" width="315" height="180" rect_control="FloaterPermPrefsRect" can_close="true" can_minimize="true">
+    <panel label="Permissions" name="permissions" width="292" height="120" left="10" border="true" bottom="-140">
+    	<button name="help" label="?" label_selected="?" bottom_delta="-25" height="18" width="22" left="260"/>
+    	<check_box bottom_delta="0" width="106" height="16" left="10" initial_value="false" label="Share with group" name="share_with_group" control_name="ShareWithGroup"/>
+    	<check_box bottom_delta="-32" width="130" height="16" initial_value="false" label="Allow anyone to copy" name="everyone_copy" control_name="EveryoneCopy"/>
+    	<text bottom_delta="-26" name="NextOwnerLabel" height="10">Next owner can:</text>
+		<check_box bottom_delta="-30" width="78" height="16" initial_value="false" label="Modify" name="next_owner_modify" control_name="NextOwnerModify"/>
+		<check_box bottom_delta="0" width="88" height="16" left_delta="78" initial_value="false" label="Copy" name="next_owner_copy" control_name="NextOwnerCopy"/>
+    	<check_box bottom_delta="0" width="106" height="16" left_delta="88" initial_value="true" label="Resell/Give away" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
     </panel>
-    <button bottom_delta="-30" font="SansSerif" halign="center" height="20" label="OK"
-	     label_selected="OK" left="90" mouse_opaque="true" name="ok" width="100" />
-    <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
-	     label_selected="Cancel" left_delta="105" mouse_opaque="true" name="cancel"
-	     width="100" />    
+	<button bottom_delta="-30" height="20" label="OK" label_selected="OK" left="90" name="ok" width="100"/>
+	<button bottom_delta="0" height="20" label="Cancel" label_selected="Cancel" left_delta="105" name="cancel" width="100"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index 735359ee6..6375db480 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" height="160" label="Audio &amp; Video" name="Media panel" width="175">
-	<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="top" height="15" increment="0.05" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_audio" toggle="true" width="25"/>
-	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.05" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_music" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="top" height="15" increment="0.05" initial_val="0.5" label="Media" label_width="55" left="10" max_val="1" min_val="0" name="Media Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_media" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="top" height="15" increment="0.05" initial_val="0.5" label="Voice" label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_voice" tab_stop="false" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="top" height="15" increment="0.05" initial_val="0.5" label="Sounds" label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="top" height="15" increment="0.05" initial_val="0.5" label="Ambient" label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_wind" toggle="true" width="25"/>
-	<slider bottom_delta="-20" control_name="AudioLevelUI" follows="top" height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" can_edit_text="true" volume="true" width="218"/>
-	<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" label_width="55" left="150" name="mute_ui" toggle="true" width="25"/>
+<panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
+	<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="40" left="3" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
+	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="40" left="3" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_music" toggle="true" width="25"/>
+	<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.005" initial_val="0.5" label="Media" label_width="40" left="3" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_media" toggle="true" width="25"/>
+	<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.005" initial_val="0.5" label="Voice" label_width="40" left="3" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
+	<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.005" initial_val="0.5" label="Sounds" label_width="40" left="3" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
+	<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.005" initial_val="0.5" label="Ambient" label_width="40" left="3" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
+	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="40" left="3" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="188"/>
+	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 2bd491452..5607d419e 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -43,7 +43,7 @@
         Key:
       </text>
       <name_editor bevel_style="in" border_style="line"
-			     border_thickness="1" bottom="-24" enabled="true" follows="left|top"
+			     border_thickness="1" bottom="-24" enabled="false" follows="left|top"
 			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
 			     max_length="36" mouse_opaque="false" name="avatar_key"
 			     width="256" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 329c013a5..2ca59db4b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -3,14 +3,14 @@
 	<text bottom="-22" height="12" left="10" name="muting_text">Volume:</text>
 	<text bottom="-215" name="streaming_prefs_text">Streaming Preferences:</text>
 	<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
-	<panel border="true" bottom="-195" filename="panel_audio.xml" height="180" label="Volume" left="148" name="Volume Panel" width="260"/>
+	<panel border="true" bottom="-175" filename="panel_audio.xml" height="140" label="Volume" left="142" name="Volume Panel" width="260"/>
 	<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
 	<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
 	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
 	<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
 	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>
-	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="100" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="250" />
-	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor" label_width="100" max_val="2" min_val="0" name="Rolloff Factor" width="250"/>
+	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="69" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="219" />
+	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor" label_width="69" max_val="2" min_val="0" name="Rolloff Factor" width="219"/>
 	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="10" label="[CURRENCY] change threshold:" label_width="128" max_val="10000" min_val="0" name="currency_change_threshold" width="192"/>
 	<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="20" label="Health Change Threshold" label_width="128" max_val="10000" min_val="0" name="Health Change Threshold" width="192" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 2bb309c0d..feb0cf325 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -2,7 +2,7 @@
 <panel border="true" bottom="-439" height="438" label="Graphics" left="102" name="Display panel" width="517">
 	<button bottom="-22" height="18" label="?" left="470" name="GraphicsPreferencesHelpButton" width="22"/>
 	<check_box bottom="-23" height="16" initial_value="false" label="Run viewer in a window" left="10" name="windowed mode" width="120" tool_tip="If unchecked, viewer will display full-screen when logged in."/>
-	<text bottom="-62" height="12" left="10" name="WindowSizeLabel">Window Size:</text>
+	<text bottom="-62" height="12" name="WindowSizeLabel">Window Size:</text>
 	<combo_box bottom="-67" height="18" left="165" name="windowsize combo" width="150">
 		<combo_item name="800x600" value="800 x 600">800x600</combo_item>
 		<combo_item name="720x480" value="720 x 480">720x480 (NTSC)</combo_item>
@@ -60,43 +60,43 @@
   </combo_box>
 
   <text bottom="-317" height="12" left="10" name="AvatarRenderingText">Avatar Rendering:</text>
-  <check_box bottom_delta="-18" control_name="RenderUseImpostors" initial_value="true" label="Avatar Impostors" left_delta="0" name="AvatarImpostors"/>
+  <check_box bottom_delta="-18" control_name="RenderUseImpostors" initial_value="true" label="Avatar Impostors" name="AvatarImpostors"/>
   <slider bottom_delta="-12" control_name="RenderAvatarMaxVisible" 	  	 decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="100" left_delta="8" max_val="50" min_val="1" name="AvatarMaxVisible" width="195"/>
-  <check_box bottom_delta="-22" control_name="RenderAvatarVP" initial_value="true" label="Hardware Skinning" left="10" name="AvatarVertexProgram"/>
-  <check_box bottom_delta="-17" control_name="RenderAvatarCloth" initial_value="true" label="Avatar Cloth" left_delta="0" name="AvatarCloth"/>
+  <check_box bottom_delta="-22" control_name="RenderAvatarVP" initial_value="true" label="Hardware Skinning" name="AvatarVertexProgram"/>
+  <check_box bottom_delta="-17" control_name="RenderAvatarCloth" initial_value="true" label="Avatar Cloth" name="AvatarCloth"/>
   <!--text bottom="-131" height="12" left="464" name="DrawDistanceMeterText1">m</text-->
   <text bottom="-131" height="12" left="470" name="DrawDistanceMeterText2">m</text>
   <slider bottom="-135"      control_name="RenderFarClip"	  	  		  decimal_digits="0" height="16" increment="8" initial_val="160" label="Draw Distance:" label_width="101" left="215" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
-  <slider bottom_delta="-16" control_name="RenderMaxPartCount"	  		  decimal_digits="0" height="16" increment="256" initial_val="4096"	  label="Max. Particle Count:" label_width="101" left_delta="0"	  max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
-  <slider bottom_delta="-20" control_name="RenderGlowResolutionPow" 	  decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:"	  label_width="101" left_delta="0" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
-  <text bottom_delta="-17" height="12" left="215" width="128" name="MeshDetailText">Mesh Detail:</text>
-  <slider bottom_delta="-18" control_name="RenderVolumeLODFactor" 		  decimal_digits="3" increment="0.125" initial_val="160" label="  Objects:" label_width="79" left_delta="0" max_val="2" min_val="0" name="ObjectMeshDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderFlexTimeFactor"  		  decimal_digits="3" increment="0.1" initial_val="160" label="  Flexiprims:" label_width="79" left_delta="0" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderTreeLODFactor"	  		  decimal_digits="3" increment="0.125" initial_val="160" label="  Trees:" label_width="79" left_delta="0" max_val="1" min_val="0" name="TreeMeshDetail"   show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderAvatarLODFactor" 		  decimal_digits="3" increment="0.125" initial_val="160" label="  Avatars:" label_width="79" left_delta="0" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderAvatarPhysicsLODFactor"  decimal_digits="3" increment="0.1" initial_val="160" label="  Avatar Physics:" label_width="79" left_delta="0" max_val="1" min_val="0"	   name="AvatarPhysicsDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderTerrainLODFactor"  	  decimal_digits="3" increment="0.125" initial_val="160" label="  Terrain:" label_width="79" left_delta="0" max_val="2" min_val="1"	   name="TerrainMeshDetail"   show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="WLSkyDetail"			  		  decimal_digits="0" increment="8" initial_val="160" label="  Sky:" label_width="79" left_delta="0" max_val="128" min_val="16" name="SkyMeshDetail"   show_text="false" width="223"/>
+  <slider bottom_delta="-16" control_name="RenderMaxPartCount"	  		  decimal_digits="0" height="16" increment="256" initial_val="4096"	  label="Max. Particle Count:" label_width="101"	  max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
+  <slider bottom_delta="-20" control_name="RenderGlowResolutionPow" 	  decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:"	  label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
+  <text bottom_delta="-17" height="12" left="215" name="MeshDetailText">Mesh Detail:</text>
+  <slider bottom_delta="-18" control_name="RenderVolumeLODFactor" increment="0.09375" label="  Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderFlexTimeFactor" increment="0.1" label="  Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderTreeLODFactor"	increment="0.125" label="  Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderAvatarLODFactor" increment="0.125" label="  Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderAvatarPhysicsLODFactor" increment="0.1" label="  Avatar Physics:" label_width="79" max_val="1" min_val="0" name="AvatarPhysicsDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="RenderTerrainLODFactor" increment="0.125" label="  Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
+  <slider bottom_delta="-20" control_name="WLSkyDetail"			  		  decimal_digits="0" increment="8" label="  Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail"   show_text="false" width="223"/>
   <text bottom="-172" height="12" left="444" name="PostProcessText">Low</text>
-  <text bottom_delta="-38" height="12" left_delta="0" name="ObjectMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" left_delta="0" name="FlexibleMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" left_delta="0" name="TreeMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" left_delta="0" name="AvatarMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" left_delta="0" name="AvatarPhysicsDetailText">Off</text>
-  <text bottom_delta="-20" height="12" left_delta="0" name="TerrainMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" left_delta="0" name="SkyMeshDetailText">Low</text>
-  <text bottom="-354"	   height="12" left="215" 	  name="LightingDetailText">Lighting Detail:</text>
-  <radio_group bottom_delta="-40" control_name="RenderLocalLights" draw_border="false" height="38" left_delta="0" name="LightingDetailRadio" width="321">
+  <text bottom_delta="-38" height="12" name="ObjectMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" name="FlexibleMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" name="TreeMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" name="AvatarMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" name="AvatarPhysicsDetailText">Off</text>
+  <text bottom_delta="-20" height="12" name="TerrainMeshDetailText">Low</text>
+  <text bottom_delta="-20" height="12" name="SkyMeshDetailText">Low</text>
+  <text bottom="-354"	   height="12" left="215" name="LightingDetailText">Lighting Detail:</text>
+  <radio_group bottom_delta="-40" control_name="RenderLocalLights" draw_border="false" height="38" name="LightingDetailRadio" width="321">
 	  <radio_item bottom="-15" height="16" left="3" name="SunMoon" width="156">Sun and moon only</radio_item>
-	  <radio_item bottom="-31" height="16" left="3" name="LocalLights" width="156">Nearby local lights</radio_item>
+	  <radio_item bottom="-31" height="16" name="LocalLights" width="156">Nearby local lights</radio_item>
   </radio_group>
   <text bottom="-354" height="12" left="370" name="TerrainDetailText">Terrain Detail:</text>
-  <radio_group bottom_delta="-40" control_name="RenderTerrainDetail" draw_border="false" height="38" left_delta="0"	name="TerrainDetailRadio" width="321">
+  <radio_group bottom_delta="-40" control_name="RenderTerrainDetail" draw_border="false" height="38" name="TerrainDetailRadio" width="321">
 	  <radio_item bottom="-15" height="16" left="3" name="0" width="315">Low</radio_item>
-	  <radio_item bottom="-31" height="16" left="3" name="2" width="315">High</radio_item>
+	  <radio_item bottom="-31" height="16" name="2" width="315">High</radio_item>
   </radio_group>
-  <button bottom="-430" font="SansSerif" height="20" label="Recommended Settings" left="130" name="Defaults" scale_image="true" width="170"/>
-  <button bottom="-430" font="SansSerif" height="20" label="Hardware Options" 	  left="310" name="GraphicsHardwareButton" scale_image="true" width="170"/>
+  <button bottom="-430" height="20" label="Recommended Settings" left="130" name="Defaults" scale_image="true" width="170"/>
+  <button bottom="-430" height="20" label="Hardware Options" 	  left="310" name="GraphicsHardwareButton" scale_image="true" width="170"/>
   <string name="resolution_format">[RES_X] x [RES_Y]</string>
   <string name="aspect_ratio_text">[NUM]:[DEN]</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
index 4b18c9ab5..d71e7acf7 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
@@ -13,5 +13,5 @@
           <text bottom_delta="-0" follows="top" height="16" left_delta="3" name="custom_skin_folder">skin folder</text>
   <button scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png" bottom_delta="-150" default_image_name="None" follows="top" width="300" height="130" left_delta="-20" label="" name="custom_skin_preview" tool_tip="Skin Preview"/>
           <text bottom_delta="-22" follows="top" height="16" left_delta="110" name="Skin_txt5">Additional info</text>
-		<text_editor bottom_delta="-100" follows="top" height="100" left_delta="-135" max_length="511" name="custom_skin_info" width="350" word_wrap="true"/>
+		<text_editor bottom_delta="-100" enabled="false" follows="top" height="100" left_delta="-135" max_length="511" name="custom_skin_info" width="350" word_wrap="true"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
index 26defbf82..a1ec31469 100644
--- a/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_toolbar.xml
@@ -1,78 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel background_opaque="true" background_visible="true" bottom="0" can_close="true"
-     can_minimize="false" can_resize="false" follows="left|right|bottom"
-     height="28" name="toolbar" width="1024">
-    
+<panel background_opaque="true" background_visible="true" bottom="0" can_close="true" can_minimize="false" can_resize="false" follows="left|right|bottom" height="28" name="toolbar" width="1024">    
   <string name="Redock Windows">Redock Windows</string>
   <panel bottom="0" filename="panel_bg_toolbar.xml" height="28" left="0" width="1024"/>
   <layout_stack name="toolbar_stack" follows="left|right|bottom|top" bottom="2" left="1" width="1022" height="26" min_width="200" min_height="26"  orientation="horizontal" border_size="0">
     <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0" left="0" />
-    <button bottom="0" font="SansSerif" height="24"
-	       image_selected="btn_chatbar_selected.tga" scale_image="true"
-	       image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"
-	       image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
-	       width="50" auto_resize="false" follows="left|right" user_resize="false"/>
+    <button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" auto_resize="false" follows="left|right" user_resize="false"/>
     <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-     <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0"
-	       name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
-	       list_position="above"
-	       width="50" follows="left|right" user_resize="false"/>
+    <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left="0" name="communicate_btn" tool_tip="Communicate with your Friends and Groups.(Ctrl-T)" list_position="above" width="50" follows="left|right" user_resize="false"/>
     <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-    <button bottom="0" font="SansSerif" height="24" label="Radar"
-        image_overlay="icn_toolbar_radar.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       label_selected="Radar" left="0" name="radar_list_btn"
-	       tool_tip="View a list of nearby avatars."
-	       width="50" follows="left|right" user_resize="false"/>
-	<button bottom="0" font="SansSerif" height="24" label="Fly"
-        image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       label_selected="Stop Flying" left="0" name="fly_btn"
-	       tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
-	       width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" font="SansSerif" height="24" label="Snapshot" left="0"
-             image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory."
-	       width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" font="SansSerif" height="24" label="Search" left="0"
-             image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left"
-             image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       name="directory_btn"
-	       tool_tip="Search for places, events, people, and more." width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" font="SansSerif" height="24" label="Build" left="0" name="build_btn"
-                         image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       tool_tip="Create new objects." width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" font="SansSerif" height="24" label="Map" left="0" name="map_btn"
-                         image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" font="SansSerif" height="24" label="Mini-Map" left="0"
-                         image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)"
-	       width="50" follows="left|right" user_resize="false"/>
-    <button bottom="0" font="SansSerif" height="24" label="Inventory" left="0"
-                         image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left"
-                        image_selected="toolbar_btn_selected.tga"
-             image_unselected="toolbar_btn_enabled.tga"
-             image_disabled="toolbar_btn_disabled.tga" scale_image="true"
-	       name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" height="24" label="Radar" image_overlay="icn_toolbar_radar.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Radar" name="radar_list_btn" tool_tip="View a list of nearby avatars.(Ctrl-Shift-A)" width="50" follows="left|right" user_resize="false"/>
+	<button bottom="0" height="24" label="Fly" image_overlay="icn_toolbar_fly.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" label_selected="Stop Flying" name="fly_btn" tool_tip="Start flying(F or Home). Use E/C or PgUp/PgDn to fly up and down." width="50" follows="left|right" user_resize="false"/>
+	<button bottom="0" height="24" label="Snapshot" image_overlay="icn_toolbar_snapshot.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="snapshot_btn" tool_tip="Save a screen shot to disk or inventory.(Ctrl-Shift-S for floater, Ctrl-`(~) takes snapshot w/o floater)" width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" height="24" label="Search" image_overlay="icn_toolbar_search.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="directory_btn" tool_tip="Search for places, events, people, and more.(Ctrl-F)" width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" height="24" label="Build" name="build_btn" image_overlay="icn_toolbar_build.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Create new objects." width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" height="24" label="Map" name="map_btn" image_overlay="icn_toolbar_map.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" tool_tip="Map of the world. (Ctrl-M)" width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" height="24" label="Mini-Map" image_overlay="icn_toolbar_minimap.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="radar_btn" tool_tip="Map of the area around you. (Ctrl-Shift-M)" width="50" follows="left|right" user_resize="false"/>
+    <button bottom="0" height="24" label="Inventory" image_overlay="icn_toolbar_inventory.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" name="inventory_btn" tool_tip="Your items. (Ctrl-I)" width="50" follows="left|right" user_resize="false"/>
   </layout_stack>
-
 </panel>
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 7134a5f77..75cd5017b 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,45 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="0"
-     follows="left|bottom" height="220" left="0" name="Adv_Settings"
-     use_bounding_rect="true" width="220" >
-	<panel bottom="1" filename="panel_bg_tab.xml" height="185" left="0" width="197" />
-	<slider bottom="160" left="5" control_name="RenderFarClip"
-		decimal_digits="0" enabled="true" follows="left|bottom" height="20"
-		increment="8" label="Draw Dist.:" can_edit_text="true"
-		label_width="53" max_val="1024" min_val="24" val_width="36" mouse_opaque="true"
-		name="DrawDistance" show_text="true" width="189" tool_tip="Change your Draw Distance"/>
-	<slider bottom_delta="-20" left="5" control_name="ThrottleBandwidthKBPS"
-		decimal_digits="0" enabled="true" follows="left|bottom" height="20"
-		increment="50" label="Bandwidth:" can_edit_text="true"
-		label_width="53" max_val="5000" min_val="50" val_width="36" mouse_opaque="true"
-		name="max_bandwidth" show_text="true" width="189" tool_tip="Set your Network bandwidth in kbps (kilobits per second)"/>
-	<slider bottom_delta="-20" left="5" control_name="RenderMaxPartCount"
-		decimal_digits="0" enabled="true" follows="left|bottom" height="20"
-		increment="256" label="Particles:" can_edit_text="true"
-		label_width="53" max_val="8192" min_val="0" val_width="36" mouse_opaque="true"
-		name="MaxParticleCount" show_text="true" width="189" tool_tip="Amount of particles to render"/>
-	<slider bottom_delta="-20" left="5" control_name="RenderAvatarMaxVisible"
-		decimal_digits="0" enabled="true" follows="left|bottom" height="20"
-		increment="1" label="Max Avs:" can_edit_text="true"
-		label_width="53" max_val="50" min_val="1" val_width="36" mouse_opaque="true"
-		name="RenderAvatarMaxVisible" show_text="true" width="189" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
-	<slider bottom_delta="-20" left="5" control_name="RenderMaxNodeSize"
-		decimal_digits="0" enabled="true" follows="left|bottom" height="20"
-		increment="64" label="Max Node:" can_edit_text="true"
-		label_width="53" max_val="16382" min_val="64" val_width="36" mouse_opaque="true"
-		name="RenderMaxNodeSize" show_text="true" width="189" tool_tip="Maximum memory size limit for rendering NEW objects, in Kb. Anything over the limit will not be rendered. [Default 4096]"/>
-	<text bottom_delta="-17" follows="left|top" font="SansSerifSmall" height="16" left="5"
-		name="cmd_line_text_7" width="189">
-		Windlight Sky Preset:
-	</text>
-	<combo_box name="WLSkyPresetsCombo" bottom_delta="-20" left="5" follows="left|top" height="18" width="189" max_chars="20" 
-		mouse_opaque="true" allow_text_entry="false" tool_tip="WindLight Presets for your Sky." />
-	<text bottom_delta="-20" follows="left|bottom" font="SansSerifSmall" height="16" left="5"
-		name="cmd_line_text_7" width="189">
-		Windlight Water Preset:
-	</text>
-	<combo_box name="WLWaterPresetsCombo" bottom_delta="-20" left="5" follows="left|bottom" height="18" width="166" max_chars="20" 
-		mouse_opaque="true" allow_text_entry="false" tool_tip="WindLight Presets for your Water." />
-	<button bottom="1" height="22" label="" left="172" name="expand" scale_image="true" toggle="true"
-		tool_tip="Hide the Settings Panel" width="22" />
+<panel bg_visible="false" border="false" border_visible="false" height="220" name="Adv_Settings" use_bounding_rect="true" width="220">
+	<panel bottom="1" filename="panel_bg_tab.xml" height="185" width="197"/>
+	<slider bottom="160" left="5" control_name="RenderFarClip" decimal_digits="0" height="20" increment="8" label="Draw Dist.:" can_edit_text="true" label_width="53" max_val="1024" min_val="24" val_width="36" name="DrawDistance" width="189" tool_tip="Change your Draw Distance"/>
+	<slider bottom_delta="-20" control_name="ThrottleBandwidthKBPS" decimal_digits="0" height="20" increment="50" label="Bandwidth:" can_edit_text="true" label_width="53" max_val="5000" min_val="50" val_width="36" name="max_bandwidth" width="189" tool_tip="Set your Network bandwidth in kbps (kilobits per second)"/>
+	<slider bottom_delta="-20" control_name="RenderMaxPartCount" decimal_digits="0" height="20" increment="256" label="Particles:" can_edit_text="true" label_width="53" max_val="8192" min_val="0" val_width="36" name="MaxParticleCount" width="189" tool_tip="Amount of particles to render"/>
+	<slider bottom_delta="-20" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="20" increment="1" label="Max Avs:" can_edit_text="true" label_width="53" max_val="50" min_val="1" val_width="36" name="RenderAvatarMaxVisible" width="189" tool_tip="How many avatars to fully render on screen. Lowering this greatly improves FPS in crowded situations. Requires Avatar Impostors to be on. [Default 35]"/>
+	<slider bottom_delta="-20" control_name="RenderVolumeLODFactor" height="20" increment="0.125" label="Obj. Detail:" can_edit_text="true" label_width="53"  max_val="2" min_val="0.5" name="Object Detail" val_width="36" width="189" tool_tip="Controls level of detail of primitives (multiplier for current screen area when calculated level of detail[0.5 to 2.0 is stable])"/>      
+	<text bottom_delta="-17" height="16" name="cmd_line_text_7">Windlight Sky Preset:</text>
+	<combo_box name="WLSkyPresetsCombo" bottom_delta="-20" height="18" width="189" tool_tip="WindLight Presets for your Sky." />
+	<text bottom_delta="-20" height="16" name="cmd_line_text_7">Windlight Water Preset:</text>
+	<combo_box name="WLWaterPresetsCombo" bottom_delta="-20" height="18" width="166" tool_tip="WindLight Presets for your Water."/>
+	<button bottom="1" height="22" label="" left="172" name="expand" scale_image="true" toggle="true" tool_tip="Hide the Settings Panel" width="22"/>
 </panel>