livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup

Ansariel 2016-07-22 09:25:58 +02:00
parent 550b3838cb
commit c7e0831f57
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewermessage.cpp
View File

@ -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);

3
indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
View File

@ -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"