From c7e0831f578d80fea50954a46e7efeb5136c784e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 22 Jul 2016 09:25:58 +0200
Subject: [PATCH] Cleanup

---
 indra/newview/llviewermessage.cpp                              | 2 --
 .../newview/skins/default/xui/en/panel_preferences_alerts.xml  | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 09e0244dc2..55d7333af0 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4209,9 +4209,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	// <FS:CR> Make osx dashboard icon bounce when window isn't in focus
 	//if (viewer_window && viewer_window->getMinimized())
 	static LLCachedControl<bool> sFlashIcon(gSavedSettings, "FSFlashOnMessage");
-	// <FS:KC> FIRE-19696: Add option to disable app icon flash/bounce on object IM
 	static LLCachedControl<bool> sFSFlashOnObjectIM(gSavedSettings, "FSFlashOnObjectIM");
-	// if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon)
 	if (viewer_window && dialog != IM_TYPING_START && dialog != IM_TYPING_STOP && sFlashIcon && (sFSFlashOnObjectIM || (chat.mChatType != CHAT_TYPE_IM)))
 	{
 		viewer_window->flashIcon(5.f);
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index c06bb356f1..b1fe508b18 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -121,8 +121,9 @@
      width="450"/>
     <check_box
      control_name="FSFlashOnObjectIM"
+     enabled_control="FSFlashOnMessage"
      height="16"
-     label="Also Flash the app icon when receiving an instant message from an object"
+     label="Also flash the app icon when receiving an instant message from an object"
      layout="topleft"
      left="20"
      name="FSFlashOnObjectIM"