From 05935d09124db6834ed7262b94de7558b6738590 Mon Sep 17 00:00:00 2001
From: Techwolf Lupindo <none@none>
Date: Tue, 22 Nov 2011 11:06:54 -0500
Subject: [PATCH] Suppport group chat prefix bugfix: Checkbox dissapears when
 checkbox off.

---
 indra/newview/fsdata.cpp      | 3 +--
 indra/newview/llimfloater.cpp | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp
index 73d7e0cc73..727f63ee0d 100644
--- a/indra/newview/fsdata.cpp
+++ b/indra/newview/fsdata.cpp
@@ -609,8 +609,7 @@ LLSD FSData::allowed_login()
 
 BOOL FSData::isSupportGroup(LLUUID id)
 {
-	static LLCachedControl<bool> chat_prefix(gSavedSettings, "FSSupportGroupChatPrefix");
-	return (chat_prefix && mSupportGroup.count(id));
+	return (mSupportGroup.count(id));
 }
 
 std::string FSData::processRequestForInfo(LLUUID requester, std::string message, std::string name, LLUUID sessionid)
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index 864b91cae2..580456c412 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -292,7 +292,8 @@ void LLIMFloater::sendMsg()
 //-TT /Patch MU_OOC from Satomi Ahn
 
 			// TL: Support group chat prefix
-			if (FSData::getInstance()->isSupportGroup(mSessionID))
+			static LLCachedControl<bool> chat_prefix(gSavedSettings, "FSSupportGroupChatPrefix");
+			if (chat_prefix && FSData::getInstance()->isSupportGroup(mSessionID))
 			{
 				if (utf8_text.find("/me ") == 0)
 				{