From 33f6a91cda243e40e84bb2521ff0558d14e4eb74 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Mon, 27 May 2013 12:10:34 -0600
Subject: [PATCH] FIRE-1061: Honor FSColorizeTags setting

---
 indra/newview/llvoavatar.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7685849a46..5e40617a20 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3167,7 +3167,10 @@ LLColor4 LLVOAvatar::getNameTagColor()
 	}
 	
 	// <FS:CR> FIRE-1061 - Color friends, lindens, muted, etc
-	color = LGGContactSets::getInstance()->getSpecialColor(getID(), color);
+	static LLUICachedControl<bool> fs_colorize("FSColorizeTags");
+	if (fs_colorize)
+		color = LGGContactSets::getInstance()->getSpecialColor(getID(), color);
+	// </FS:CR>
 	
 	static LLUICachedControl<bool> fsShowOwnTagColor("FSShowOwnTagColor");
 	if (isSelf() && fsShowOwnTagColor)