svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa).

1 files changed, 70 insertions, 69 deletions

diff --git a/indra/llcharacter/llanimationstates.cpp b/indra/llcharacter/llanimationstates.cpp
index 3e5a1e6705..415b945e88 100644
--- a/indra/llcharacter/llanimationstates.cpp
+++ b/indra/llcharacter/llanimationstates.cpp
@@ -260,76 +260,77 @@ LLUUID LLAnimationLibrary::stringToAnimState( const char *name, BOOL allow_ids )
 }
 
 // Animation states that the user can trigger as part of a gesture
+// See struct LLAnimStateEntry in header for label location information
 const LLAnimStateEntry gUserAnimStates[] = {
-	LLAnimStateEntry("Afraid",			"express_afraid",		ANIM_AGENT_AFRAID),
-	LLAnimStateEntry("Angry",			"express_anger",		ANIM_AGENT_ANGRY),
-	LLAnimStateEntry("Away",			"away",					ANIM_AGENT_AWAY),
-	LLAnimStateEntry("Backflip",		"backflip",				ANIM_AGENT_BACKFLIP),
-	LLAnimStateEntry("Belly Laugh",		"express_laugh",		ANIM_AGENT_BELLY_LAUGH),
-	LLAnimStateEntry("BigSmile",		"express_toothsmile",	ANIM_AGENT_EXPRESS_TOOTHSMILE),
-	LLAnimStateEntry("Blow Kiss",		"blowkiss",				ANIM_AGENT_BLOW_KISS),
-	LLAnimStateEntry("Bored",			"express_bored",		ANIM_AGENT_BORED),
-	LLAnimStateEntry("Bow",				"bow",					ANIM_AGENT_BOW),
-	LLAnimStateEntry("Clap",			"clap",					ANIM_AGENT_CLAP),
-	LLAnimStateEntry("Court Bow",		"courtbow",				ANIM_AGENT_COURTBOW),
-	LLAnimStateEntry("Cry",				"express_cry",			ANIM_AGENT_CRY),
-	LLAnimStateEntry("Dance 1",			"dance1",				ANIM_AGENT_DANCE1),
-	LLAnimStateEntry("Dance 2",			"dance2",				ANIM_AGENT_DANCE2),
-	LLAnimStateEntry("Dance 3",			"dance3",				ANIM_AGENT_DANCE3),
-	LLAnimStateEntry("Dance 4",			"dance4",				ANIM_AGENT_DANCE4),
-	LLAnimStateEntry("Dance 5",			"dance5",				ANIM_AGENT_DANCE5),
-	LLAnimStateEntry("Dance 6",			"dance6",				ANIM_AGENT_DANCE6),
-	LLAnimStateEntry("Dance 7",			"dance7",				ANIM_AGENT_DANCE7),
-	LLAnimStateEntry("Dance 8",			"dance8",				ANIM_AGENT_DANCE8),
-	LLAnimStateEntry("Disdain",			"express_disdain",		ANIM_AGENT_EXPRESS_DISDAIN),
-	LLAnimStateEntry("Drink",			"drink",				ANIM_AGENT_DRINK),
-	LLAnimStateEntry("Embarrassed",		"express_embarrased",	ANIM_AGENT_EMBARRASSED),
-	LLAnimStateEntry("Finger Wag",		"angry_fingerwag",		ANIM_AGENT_FINGER_WAG),
-	LLAnimStateEntry("Fist Pump",		"fist_pump",			ANIM_AGENT_FIST_PUMP),
-	LLAnimStateEntry("Floating Yoga",	"yoga_float",			ANIM_AGENT_YOGA_FLOAT),
-	LLAnimStateEntry("Frown",			"express_frown",		ANIM_AGENT_EXPRESS_FROWN),
-	LLAnimStateEntry("Impatient",		"impatient",			ANIM_AGENT_IMPATIENT),
-	LLAnimStateEntry("Jump For Joy",	"jumpforjoy",			ANIM_AGENT_JUMP_FOR_JOY),
-	LLAnimStateEntry("Kiss My Butt",	"kissmybutt",			ANIM_AGENT_KISS_MY_BUTT),
-	LLAnimStateEntry("Kiss",			"express_kiss",			ANIM_AGENT_EXPRESS_KISS),
-	LLAnimStateEntry("Laugh",			"laugh_short",			ANIM_AGENT_LAUGH_SHORT),
-	LLAnimStateEntry("Muscle Beach",	"musclebeach",			ANIM_AGENT_MUSCLE_BEACH),
-	LLAnimStateEntry("No (Unhappy)",	"no_unhappy",			ANIM_AGENT_NO_UNHAPPY),
-	LLAnimStateEntry("No",				"no_head",				ANIM_AGENT_NO),
-	LLAnimStateEntry("Nya-nya-nya",		"nyanya",				ANIM_AGENT_NYAH_NYAH),
-	LLAnimStateEntry("One-Two Punch",	"punch_onetwo",			ANIM_AGENT_ONETWO_PUNCH),
-	LLAnimStateEntry("Open Mouth",		"express_open_mouth",	ANIM_AGENT_EXPRESS_OPEN_MOUTH),
-	LLAnimStateEntry("Peace",			"peace",				ANIM_AGENT_PEACE),
-	LLAnimStateEntry("Point at Other",	"point_you",			ANIM_AGENT_POINT_YOU),
-	LLAnimStateEntry("Point at Self",	"point_me",				ANIM_AGENT_POINT_ME),
-	LLAnimStateEntry("Punch Left",		"punch_l",				ANIM_AGENT_PUNCH_LEFT),
-	LLAnimStateEntry("Punch Right",		"punch_r",				ANIM_AGENT_PUNCH_RIGHT),
-	LLAnimStateEntry("RPS count",		"rps_countdown",		ANIM_AGENT_RPS_COUNTDOWN),
-	LLAnimStateEntry("RPS paper",		"rps_paper",			ANIM_AGENT_RPS_PAPER),
-	LLAnimStateEntry("RPS rock",		"rps_rock",				ANIM_AGENT_RPS_ROCK),
-	LLAnimStateEntry("RPS scissors",	"rps_scissors",			ANIM_AGENT_RPS_SCISSORS),
-	LLAnimStateEntry("Repulsed",		"express_repulsed",		ANIM_AGENT_EXPRESS_REPULSED),
-	LLAnimStateEntry("Roundhouse Kick",	"kick_roundhouse_r",	ANIM_AGENT_ROUNDHOUSE_KICK),
-	LLAnimStateEntry("Sad",				"express_sad",			ANIM_AGENT_SAD),
-	LLAnimStateEntry("Salute",			"salute",				ANIM_AGENT_SALUTE),
-	LLAnimStateEntry("Shout",			"shout",				ANIM_AGENT_SHOUT),
-	LLAnimStateEntry("Shrug",			"express_shrug",		ANIM_AGENT_SHRUG),
-	LLAnimStateEntry("Smile",			"express_smile",		ANIM_AGENT_EXPRESS_SMILE),
-	LLAnimStateEntry("Smoke Idle",		"smoke_idle",			ANIM_AGENT_SMOKE_IDLE),
-	LLAnimStateEntry("Smoke Inhale",	"smoke_inhale",			ANIM_AGENT_SMOKE_INHALE),
-	LLAnimStateEntry("Smoke Throw Down","smoke_throw_down",		ANIM_AGENT_SMOKE_THROW_DOWN),
-	LLAnimStateEntry("Surprise",		"express_surprise",		ANIM_AGENT_SURPRISE),
-	LLAnimStateEntry("Sword Strike",	"sword_strike_r",		ANIM_AGENT_SWORD_STRIKE),
-	LLAnimStateEntry("Tantrum",			"angry_tantrum",		ANIM_AGENT_TANTRUM),
-	LLAnimStateEntry("TongueOut",		"express_tongue_out",	ANIM_AGENT_EXPRESS_TONGUE_OUT),
-	LLAnimStateEntry("Wave",			"hello",				ANIM_AGENT_HELLO),
-	LLAnimStateEntry("Whisper",			"whisper",				ANIM_AGENT_WHISPER),
-	LLAnimStateEntry("Whistle",			"whistle",				ANIM_AGENT_WHISTLE),
-	LLAnimStateEntry("Wink",			"express_wink",			ANIM_AGENT_WINK),
-	LLAnimStateEntry("Wink (Hollywood)","wink_hollywood",		ANIM_AGENT_WINK_HOLLYWOOD),
-	LLAnimStateEntry("Worry",			"express_worry",		ANIM_AGENT_EXPRESS_WORRY),
-	LLAnimStateEntry("Yes (Happy)",		"yes_happy",			ANIM_AGENT_YES_HAPPY),
-	LLAnimStateEntry("Yes",				"yes_head",				ANIM_AGENT_YES),
+	LLAnimStateEntry("express_afraid",		ANIM_AGENT_AFRAID),
+	LLAnimStateEntry("express_anger",		ANIM_AGENT_ANGRY),
+	LLAnimStateEntry("away",					ANIM_AGENT_AWAY),
+	LLAnimStateEntry("backflip",				ANIM_AGENT_BACKFLIP),
+	LLAnimStateEntry("express_laugh",		ANIM_AGENT_BELLY_LAUGH),
+	LLAnimStateEntry("express_toothsmile",	ANIM_AGENT_EXPRESS_TOOTHSMILE),
+	LLAnimStateEntry("blowkiss",				ANIM_AGENT_BLOW_KISS),
+	LLAnimStateEntry("express_bored",		ANIM_AGENT_BORED),
+	LLAnimStateEntry("bow",					ANIM_AGENT_BOW),
+	LLAnimStateEntry("clap",					ANIM_AGENT_CLAP),
+	LLAnimStateEntry("courtbow",				ANIM_AGENT_COURTBOW),
+	LLAnimStateEntry("express_cry",			ANIM_AGENT_CRY),
+	LLAnimStateEntry("dance1",				ANIM_AGENT_DANCE1),
+	LLAnimStateEntry("dance2",				ANIM_AGENT_DANCE2),
+	LLAnimStateEntry("dance3",				ANIM_AGENT_DANCE3),
+	LLAnimStateEntry("dance4",				ANIM_AGENT_DANCE4),
+	LLAnimStateEntry("dance5",				ANIM_AGENT_DANCE5),
+	LLAnimStateEntry("dance6",				ANIM_AGENT_DANCE6),
+	LLAnimStateEntry("dance7",				ANIM_AGENT_DANCE7),
+	LLAnimStateEntry("dance8",				ANIM_AGENT_DANCE8),
+	LLAnimStateEntry("express_disdain",		ANIM_AGENT_EXPRESS_DISDAIN),
+	LLAnimStateEntry("drink",				ANIM_AGENT_DRINK),
+	LLAnimStateEntry("express_embarrased",	ANIM_AGENT_EMBARRASSED),
+	LLAnimStateEntry("angry_fingerwag",		ANIM_AGENT_FINGER_WAG),
+	LLAnimStateEntry("fist_pump",			ANIM_AGENT_FIST_PUMP),
+	LLAnimStateEntry("yoga_float",			ANIM_AGENT_YOGA_FLOAT),
+	LLAnimStateEntry("express_frown",		ANIM_AGENT_EXPRESS_FROWN),
+	LLAnimStateEntry("impatient",			ANIM_AGENT_IMPATIENT),
+	LLAnimStateEntry("jumpforjoy",			ANIM_AGENT_JUMP_FOR_JOY),
+	LLAnimStateEntry("kissmybutt",			ANIM_AGENT_KISS_MY_BUTT),
+	LLAnimStateEntry("express_kiss",			ANIM_AGENT_EXPRESS_KISS),
+	LLAnimStateEntry("laugh_short",			ANIM_AGENT_LAUGH_SHORT),
+	LLAnimStateEntry("musclebeach",			ANIM_AGENT_MUSCLE_BEACH),
+	LLAnimStateEntry("no_unhappy",			ANIM_AGENT_NO_UNHAPPY),
+	LLAnimStateEntry("no_head",				ANIM_AGENT_NO),
+	LLAnimStateEntry("nyanya",				ANIM_AGENT_NYAH_NYAH),
+	LLAnimStateEntry("punch_onetwo",			ANIM_AGENT_ONETWO_PUNCH),
+	LLAnimStateEntry("express_open_mouth",	ANIM_AGENT_EXPRESS_OPEN_MOUTH),
+	LLAnimStateEntry("peace",				ANIM_AGENT_PEACE),
+	LLAnimStateEntry("point_you",			ANIM_AGENT_POINT_YOU),
+	LLAnimStateEntry("point_me",				ANIM_AGENT_POINT_ME),
+	LLAnimStateEntry("punch_l",				ANIM_AGENT_PUNCH_LEFT),
+	LLAnimStateEntry("punch_r",				ANIM_AGENT_PUNCH_RIGHT),
+	LLAnimStateEntry("rps_countdown",		ANIM_AGENT_RPS_COUNTDOWN),
+	LLAnimStateEntry("rps_paper",			ANIM_AGENT_RPS_PAPER),
+	LLAnimStateEntry("rps_rock",				ANIM_AGENT_RPS_ROCK),
+	LLAnimStateEntry("rps_scissors",			ANIM_AGENT_RPS_SCISSORS),
+	LLAnimStateEntry("express_repulsed",		ANIM_AGENT_EXPRESS_REPULSED),
+	LLAnimStateEntry("kick_roundhouse_r",	ANIM_AGENT_ROUNDHOUSE_KICK),
+	LLAnimStateEntry("express_sad",			ANIM_AGENT_SAD),
+	LLAnimStateEntry("salute",				ANIM_AGENT_SALUTE),
+	LLAnimStateEntry("shout",				ANIM_AGENT_SHOUT),
+	LLAnimStateEntry("express_shrug",		ANIM_AGENT_SHRUG),
+	LLAnimStateEntry("express_smile",		ANIM_AGENT_EXPRESS_SMILE),
+	LLAnimStateEntry("smoke_idle",			ANIM_AGENT_SMOKE_IDLE),
+	LLAnimStateEntry("smoke_inhale",			ANIM_AGENT_SMOKE_INHALE),
+	LLAnimStateEntry("smoke_throw_down",		ANIM_AGENT_SMOKE_THROW_DOWN),
+	LLAnimStateEntry("express_surprise",		ANIM_AGENT_SURPRISE),
+	LLAnimStateEntry("sword_strike_r",		ANIM_AGENT_SWORD_STRIKE),
+	LLAnimStateEntry("angry_tantrum",		ANIM_AGENT_TANTRUM),
+	LLAnimStateEntry("express_tongue_out",	ANIM_AGENT_EXPRESS_TONGUE_OUT),
+	LLAnimStateEntry("hello",				ANIM_AGENT_HELLO),
+	LLAnimStateEntry("whisper",				ANIM_AGENT_WHISPER),
+	LLAnimStateEntry("whistle",				ANIM_AGENT_WHISTLE),
+	LLAnimStateEntry("express_wink",			ANIM_AGENT_WINK),
+	LLAnimStateEntry("wink_hollywood",		ANIM_AGENT_WINK_HOLLYWOOD),
+	LLAnimStateEntry("express_worry",		ANIM_AGENT_EXPRESS_WORRY),
+	LLAnimStateEntry("yes_happy",			ANIM_AGENT_YES_HAPPY),
+	LLAnimStateEntry("yes_head",				ANIM_AGENT_YES),
 };
 
 const S32 gUserAnimStatesCount = sizeof(gUserAnimStates) / sizeof(gUserAnimStates[0]);