diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 071fd9c6a..b4a37e0a4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1209,7 +1209,19 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>1</integer>
-    </map>
+  </map>
+  <key>ResetFocusOnSelfClick</key>
+		<map>
+		<key>Comment</key>
+		<string>Setting this to TRUE resets your camera when you left-click your avatar</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>1</integer>
+		</map>
+
     <key>OptionShowGroupNameInChatIM</key>
     <map>
       <key>Comment</key>
@@ -1221,7 +1233,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <!--Expanded settings from Vanilla SL -->
     <key>BeauchampUseInventoryLinks</key>
     <map>
       <key>Comment</key>
@@ -1260,17 +1271,6 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>ShyotlRenderUseStreamVBO</key>
-    <map>
-      <key>Comment</key>
-      <string>Use VBO's for stream buffers</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>OptionShowGroupNameInChatIM</key>
     <map>
       <key>Comment</key>
@@ -1423,7 +1423,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>EmeraldBoobMass</key>
     <map>