From ee334d59620a9d472cec2d3340275e99e44f23b8 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 20 Sep 2017 01:26:48 +0200
Subject: [PATCH] Remove FSEnableRiggingToAttachmentSpots debug setting as
 rigging to attachment spots has officially been added as per rev.
 33d393222834

Leave the actual mapping intact for now as LL didn't address the issue with attachment spots containing underscores yet
---
 indra/llprimitive/llmodelloader.cpp     | 184 ++++++++++++------------
 indra/newview/app_settings/settings.xml |  11 --
 2 files changed, 90 insertions(+), 105 deletions(-)

diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp
index 3ae6232776..d9db4b402b 100644
--- a/indra/llprimitive/llmodelloader.cpp
+++ b/indra/llprimitive/llmodelloader.cpp
@@ -136,100 +136,96 @@ LLModelLoader::LLModelLoader(
 , mMaxJointsPerMesh(maxJointsPerMesh)
 , mJointMap(legalJointNamesMap)
 {    
-	// <FS:Ansariel> FIRE-17144: Option to rig to attachment spots
-	if (LLControlGroup::getInstance("Global")->getBOOL("FSEnableRiggingToAttachmentSpots"))
-	{
-		// <FS:Beq> (with Ansariel) FIRE-21000: rigging to attachment points broken since at least v5.0.1
-		// ugly hack, we have to add mapping for '_' and ' ' also map a few other missing joints
-		// fixes the broken missing leg. 
-		// *** Revisit this later and normalise joint lookup ***
-		mJointMap["Right Ear"] = "Right Ear";
-		mJointMap["Left Ear"] = "Left Ear";
-		mJointMap["Right Eyeball"] = "Right Eyeball";
-		mJointMap["Left Eyeball"] = "Left Eyeball";
-		mJointMap["Right Shoulder"] = "Right Shoulder";
-		mJointMap["Left Shoulder"] = "Left Shoulder";
-		mJointMap["R Upper Arm"] = "R Upper Arm";
-		mJointMap["L Upper Arm"] = "L Upper Arm";
-		mJointMap["R Forearm"] = "R Forearm";
-		mJointMap["L Forearm"] = "L Forearm";
-		mJointMap["Right Hand"] = "Right Hand";
-		mJointMap["Left Hand"] = "Left Hand";
-		mJointMap["Right Pec"] = "Right Pec";
-		mJointMap["Left Pec"] = "Left Pec";
-		mJointMap["Avatar Center"] = "Avatar Center";
-		mJointMap["Right Hip"] = "Right Hip";
-		mJointMap["Left Hip"] = "Left Hip";
-		mJointMap["R Upper Leg"] = "R Upper Leg";
-		mJointMap["L Upper Leg"] = "L Upper Leg";
-		mJointMap["R Lower Leg"] = "R Lower Leg";
-		mJointMap["L Lower Leg"] = "R Lower Leg";
-		mJointMap["Right Foot"] = "Right Foot";
-		mJointMap["Neck"] = "Neck";
-		mJointMap["Spine"] = "Spine";
-		mJointMap["Pelvis"] = "Pelvis";
-		mJointMap["Chin"] = "Chin";
-		mJointMap["Nose"] = "Nose";
-		mJointMap["Stomach"] = "Stomach";
-		mJointMap["Mouth"] = "Mouth";
-		mJointMap["Right Ear"] = "Right Ear";
-		mJointMap["Left Ear"] = "Left Ear";
-		mJointMap["Right Eyeball"] = "Right Eyeball";
-		mJointMap["Left Eyeball"] = "Left Eyeball";
-		mJointMap["Right Shoulder"] = "Right Shoulder";
-		mJointMap["Left Shoulder"] = "Left Shoulder";
-		mJointMap["R Upper Arm"] = "R Upper Arm";
-		mJointMap["L Upper Arm"] = "L Upper Arm";
-		mJointMap["R Forearm"] = "R Forearm";
-		mJointMap["L Forearm"] = "L Forearm";
-		mJointMap["Right Hand"] = "Right Hand";
-		mJointMap["Left Hand"] = "Left Hand";
-		mJointMap["Right Pec"] = "Right Pec";
-		mJointMap["Left Pec"] = "Left Pec";
-		mJointMap["Avatar Center"] = "Avatar Center";
-		mJointMap["Right Hip"] = "Right Hip";
-		mJointMap["Left Hip"] = "Left Hip";
-		mJointMap["R Upper Leg"] = "R Upper Leg";
-		mJointMap["L Upper Leg"] = "L Upper Leg";
-		mJointMap["R Lower Leg"] = "R Lower Leg";
-		mJointMap["L Lower Leg"] = "L Lower Leg";
-		mJointMap["Right Foot"] = "Right Foot";
-		mJointMap["Left Foot"] = "Left Foot";
-		mJointMap["Neck"] = "Neck";
-		mJointMap["Spine"] = "Spine";
-		mJointMap["Pelvis"] = "Pelvis";
-		mJointMap["Chin"] = "Chin";
-		mJointMap["Nose"] = "Nose";
-		mJointMap["Stomach"] = "Stomach";
-		mJointMap["Mouth"] = "Mouth";
-		mJointMap["Right_Ear"] = "Right Ear";
-		mJointMap["Left_Ear"] = "Left Ear";
-		mJointMap["Right_Eyeball"] = "Right Eyeball";
-		mJointMap["Left_Eyeball"] = "Left Eyeball";
-		mJointMap["Right_Shoulder"] = "Right Shoulder";
-		mJointMap["Left_Shoulder"] = "Left Shoulder";
-		mJointMap["R_Upper_Arm"] = "R Upper Arm";
-		mJointMap["L_Upper_Arm"] = "L Upper Arm";
-		mJointMap["R_Forearm"] = "R Forearm";
-		mJointMap["L_Forearm"] = "L Forearm";
-		mJointMap["Right_Hand"] = "Right Hand";
-		mJointMap["Left_Hand"] = "Left Hand";
-		mJointMap["Right_Pec"] = "Right Pec";
-		mJointMap["Left_Pec"] = "Left Pec";
-		mJointMap["Avatar_Center"] = "Avatar Center";
-		mJointMap["Right_Hip"] = "Right Hip";
-		mJointMap["Left_Hip"] = "Left Hip";
-		mJointMap["R_Upper_Leg"] = "R Upper Leg";
-		mJointMap["L_Upper_Leg"] = "L Upper Leg";
-		mJointMap["R_Lower_Leg"] = "R Lower Leg";
-		mJointMap["L_Lower_Leg"] = "L Lower Leg";
-		mJointMap["Right_Foot"] = "Right Foot";
-		mJointMap["Left_Foot"] = "Left Foot";
-		mJointMap["Chest"] = "Chest";
-		mJointMap["Skull"] = "Skull";
-		//</FS:Beq>
-	}
-	// </FS:Ansariel>
+	// <FS:Beq> (with Ansariel) FIRE-21000: rigging to attachment points broken since at least v5.0.1
+	// ugly hack, we have to add mapping for '_' and ' ' also map a few other missing joints
+	// fixes the broken missing leg. 
+	// *** Revisit this later and normalise joint lookup ***
+	mJointMap["Right Ear"] = "Right Ear";
+	mJointMap["Left Ear"] = "Left Ear";
+	mJointMap["Right Eyeball"] = "Right Eyeball";
+	mJointMap["Left Eyeball"] = "Left Eyeball";
+	mJointMap["Right Shoulder"] = "Right Shoulder";
+	mJointMap["Left Shoulder"] = "Left Shoulder";
+	mJointMap["R Upper Arm"] = "R Upper Arm";
+	mJointMap["L Upper Arm"] = "L Upper Arm";
+	mJointMap["R Forearm"] = "R Forearm";
+	mJointMap["L Forearm"] = "L Forearm";
+	mJointMap["Right Hand"] = "Right Hand";
+	mJointMap["Left Hand"] = "Left Hand";
+	mJointMap["Right Pec"] = "Right Pec";
+	mJointMap["Left Pec"] = "Left Pec";
+	mJointMap["Avatar Center"] = "Avatar Center";
+	mJointMap["Right Hip"] = "Right Hip";
+	mJointMap["Left Hip"] = "Left Hip";
+	mJointMap["R Upper Leg"] = "R Upper Leg";
+	mJointMap["L Upper Leg"] = "L Upper Leg";
+	mJointMap["R Lower Leg"] = "R Lower Leg";
+	mJointMap["L Lower Leg"] = "R Lower Leg";
+	mJointMap["Right Foot"] = "Right Foot";
+	mJointMap["Neck"] = "Neck";
+	mJointMap["Spine"] = "Spine";
+	mJointMap["Pelvis"] = "Pelvis";
+	mJointMap["Chin"] = "Chin";
+	mJointMap["Nose"] = "Nose";
+	mJointMap["Stomach"] = "Stomach";
+	mJointMap["Mouth"] = "Mouth";
+	mJointMap["Right Ear"] = "Right Ear";
+	mJointMap["Left Ear"] = "Left Ear";
+	mJointMap["Right Eyeball"] = "Right Eyeball";
+	mJointMap["Left Eyeball"] = "Left Eyeball";
+	mJointMap["Right Shoulder"] = "Right Shoulder";
+	mJointMap["Left Shoulder"] = "Left Shoulder";
+	mJointMap["R Upper Arm"] = "R Upper Arm";
+	mJointMap["L Upper Arm"] = "L Upper Arm";
+	mJointMap["R Forearm"] = "R Forearm";
+	mJointMap["L Forearm"] = "L Forearm";
+	mJointMap["Right Hand"] = "Right Hand";
+	mJointMap["Left Hand"] = "Left Hand";
+	mJointMap["Right Pec"] = "Right Pec";
+	mJointMap["Left Pec"] = "Left Pec";
+	mJointMap["Avatar Center"] = "Avatar Center";
+	mJointMap["Right Hip"] = "Right Hip";
+	mJointMap["Left Hip"] = "Left Hip";
+	mJointMap["R Upper Leg"] = "R Upper Leg";
+	mJointMap["L Upper Leg"] = "L Upper Leg";
+	mJointMap["R Lower Leg"] = "R Lower Leg";
+	mJointMap["L Lower Leg"] = "L Lower Leg";
+	mJointMap["Right Foot"] = "Right Foot";
+	mJointMap["Left Foot"] = "Left Foot";
+	mJointMap["Neck"] = "Neck";
+	mJointMap["Spine"] = "Spine";
+	mJointMap["Pelvis"] = "Pelvis";
+	mJointMap["Chin"] = "Chin";
+	mJointMap["Nose"] = "Nose";
+	mJointMap["Stomach"] = "Stomach";
+	mJointMap["Mouth"] = "Mouth";
+	mJointMap["Right_Ear"] = "Right Ear";
+	mJointMap["Left_Ear"] = "Left Ear";
+	mJointMap["Right_Eyeball"] = "Right Eyeball";
+	mJointMap["Left_Eyeball"] = "Left Eyeball";
+	mJointMap["Right_Shoulder"] = "Right Shoulder";
+	mJointMap["Left_Shoulder"] = "Left Shoulder";
+	mJointMap["R_Upper_Arm"] = "R Upper Arm";
+	mJointMap["L_Upper_Arm"] = "L Upper Arm";
+	mJointMap["R_Forearm"] = "R Forearm";
+	mJointMap["L_Forearm"] = "L Forearm";
+	mJointMap["Right_Hand"] = "Right Hand";
+	mJointMap["Left_Hand"] = "Left Hand";
+	mJointMap["Right_Pec"] = "Right Pec";
+	mJointMap["Left_Pec"] = "Left Pec";
+	mJointMap["Avatar_Center"] = "Avatar Center";
+	mJointMap["Right_Hip"] = "Right Hip";
+	mJointMap["Left_Hip"] = "Left Hip";
+	mJointMap["R_Upper_Leg"] = "R Upper Leg";
+	mJointMap["L_Upper_Leg"] = "L Upper Leg";
+	mJointMap["R_Lower_Leg"] = "R Lower Leg";
+	mJointMap["L_Lower_Leg"] = "L Lower Leg";
+	mJointMap["Right_Foot"] = "Right Foot";
+	mJointMap["Left_Foot"] = "Left Foot";
+	mJointMap["Chest"] = "Chest";
+	mJointMap["Skull"] = "Skull";
+	//</FS:Beq>
+
 	assert_main_thread();
 	sActiveLoaderList.push_back(this) ;
 }
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0a44055d9e..1b66445854 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -24101,17 +24101,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>20</integer>
     </map>
-    <key>FSEnableRiggingToAttachmentSpots</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable upload of mesh models rigged to attachment spots</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>FSEnableMovingFolderLinks</key>
     <map>
       <key>Comment</key>