1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index f1a6ef78a6..1c9b2e6acb 100755
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -924,6 +924,10 @@ void LLFloaterIMContainer::onCustomAction(const LLSD& userdata)
 	{
 		setSortOrderParticipants(LLConversationFilter::SO_DISTANCE);
 	}
+	if ("view_icons" == command)
+	{
+		gSavedSettings.setBOOL("ChatShowIcons", !gSavedSettings.getBOOL("ChatShowIcons"));
+	}
 	if ("chat_preferences" == command)
 	{
 		LLFloaterPreference * floater_prefp = LLFloaterReg::showTypedInstance<LLFloaterPreference>("preferences");
@@ -974,6 +978,10 @@ BOOL LLFloaterIMContainer::isActionChecked(const LLSD& userdata)
 	{
 		return (order.getSortOrderParticipants() == LLConversationFilter::SO_DISTANCE);
 	}
+	if ("view_icons" == command)
+	{
+		return gSavedSettings.getBOOL("ChatShowIcons");
+	}
 	if ("Translating.Enabled" == command)
 	{
 		return gSavedPerAccountSettings.getBOOL("TranslatingEnabled");