3 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index f0d8b77afd..a87310955f 100755
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -274,7 +274,8 @@ ATTACH_LLLEG		Passed to llAttachToAvatar to attach task to left lower leg
 ATTACH_BELLY		Passed to llAttachToAvatar to attach task to belly
 ATTACH_LEFT_PEC		Passed to llAttachToAvatar to attach task to left pectoral
 ATTACH_RIGHT_PEC	Passed to llAttachToAvatar to attach task to right pectoral
-
+ATTACH_NECK			Passed to llAttachToAvatar to attach task to neck
+ATTACH_AVATAR_CENTER	Passed to llAttachToAvatar to attach task to avatar center
 LAND_LEVEL			Passed to llModifyLand to level terrain
 LAND_RAISE			Passed to llModifyLand to raise terrain
 LAND_LOWER			Passed to llModifyLand to lower terrain
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2a4e10fb6f..015c307afc 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8489,6 +8489,18 @@
     <integer>0</integer>
   </map>
 
+  <key>RenderDepthOfFieldInEditMode</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether to use depth of field effect when in edit mode</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+
   <key>CameraDoFResScale</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index 43ed41a205..efd0d03965 100755
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -45,3 +45,4 @@ mat4 getObjectSkinnedTransform()
 		
 	return mat;
 }
+