From 971eb7996e7791cf580062a67ec351dc5b55d999 Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Sat, 29 Oct 2011 00:05:46 -0700
Subject: [PATCH 1/2] STORM-1672/VWR-26120: add attachment points for Neck and
 Avatar Center

---
 indra/newview/character/avatar_lad.xml | 22 +++++++++++++++++++++-
 indra/newview/llvoavatar.cpp           |  4 ++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 5ace06923a..aa7c054c2d 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -392,7 +392,27 @@
        hud="true"
        max_attachment_offset="2.0"
        visible_in_first_person="true" />
-
+       
+    <attachment_point
+       id="39"
+       group="9"
+       pie_slice="1"
+       name="Neck"
+       joint="mNeck"
+       position="0 0 0"
+       rotation="0 0 0"
+       visible_in_first_person="true" />
+  	
+  	<attachment_point
+       id="40"
+       group="9"
+       pie_slice="2"
+       name="Avatar Center"
+       joint="mRoot"
+       position="0 0 0"
+       rotation="0 0 0"
+       visible_in_first_person="true" />
+  	
     <attachment_point
        id="127"
        group="6"
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 25e33b449c..dad6d8555e 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -6180,14 +6180,14 @@ LLViewerJointAttachment* LLVOAvatar::getTargetAttachmentPoint(LLViewerObject* vi
 
 	if (!attachment)
 	{
-		if(attachmentID != 127 && !((attachmentID > 38) && (attachmentID <= 68)))
+		if(attachmentID != 127 && !((attachmentID > 40) && (attachmentID <= 68)))
 		{
 			llwarns << "Object attachment point invalid: " << attachmentID << llendl;
 		}
 //		attachment = get_if_there(mAttachmentPoints, 1, (LLViewerJointAttachment*)NULL); // Arbitrary using 1 (chest)
 // [SL:KB] - Patch: Appearance-LegacyMultiAttachment | Checked: 2010-08-28 (Catznip-2.6.0a) | Added: Catznip-2.1.2a
 		S32 idxAttachPt = 1;
-		if ( (!isSelf()) && (gSavedSettings.getBOOL("LegacyMultiAttachmentSupport")) && (attachmentID > 38) && (attachmentID <= 68) )
+		if ( (!isSelf()) && (gSavedSettings.getBOOL("LegacyMultiAttachmentSupport")) && (attachmentID > 40) && (attachmentID <= 68) )
 			idxAttachPt = attachmentID - 38;
 		attachment = get_if_there(mAttachmentPoints, idxAttachPt, (LLViewerJointAttachment*)NULL);
 // [/SL:KB]

From ec494f66cf14312e5cebef31fd90633b30bf1b5b Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Sat, 29 Oct 2011 09:29:00 -0700
Subject: [PATCH 2/2] STORM-1672/VWR-26120: add attachment points for Neck and
 Avatar Center (missing strings)

---
 indra/newview/skins/default/xui/en/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 18a9108e78..4089d0b944 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2211,6 +2211,8 @@ Returns a string with the requested data about the region
 	<string name="Stomach">Stomach</string>
 	<string name="Left Pec">Left Pec</string>
 	<string name="Right Pec">Right Pec</string>
+	<string name="Neck">Neck</string>
+	<string name="Avatar Center">Avatar Center</string>
 	<string name="Bridge">Bridge</string>
 	<string name="Invalid Attachment">Invalid Attachment Point</string>