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

Don't call gAgent.isDoNotDisturb() several times on each IM message, assign it to BOOL first - and use instead

master
PanteraPolnocy 2013-07-09 09:28:32 +02:00
parent 75a9894ce1
commit 7416d71731
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llimview.cpp
View File

@ -2913,6 +2913,7 @@ void LLIMMgr::addMessage(
// <FS:PP> Configurable IM sounds
static LLCachedControl<U32> PlayModeUISndNewIncomingIMSession(gSavedSettings, "PlayModeUISndNewIncomingIMSession");
static LLCachedControl<U32> PlayModeUISndNewIncomingGroupIMSession(gSavedSettings, "PlayModeUISndNewIncomingGroupIMSession");
BOOL do_not_disturb = gAgent.isDoNotDisturb();
// </FS:PP> Configurable IM sounds
bool new_session = !hasSession(new_session_id);
@ -2982,26 +2983,26 @@ void LLIMMgr::addMessage(
// <FS:PP> Configurable IM sounds
// //Play sound for new conversations
// if (!gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation") == TRUE))
if(!gAgent.isDoNotDisturb() && PlayModeUISndNewIncomingIMSession != 0 && dialog == IM_NOTHING_SPECIAL)
if(!do_not_disturb && PlayModeUISndNewIncomingIMSession != 0 && dialog == IM_NOTHING_SPECIAL)
{
make_ui_sound("UISndNewIncomingIMSession");
}
else if(!gAgent.isDoNotDisturb() && PlayModeUISndNewIncomingGroupIMSession != 0 && dialog != IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession != 0 && dialog != IM_NOTHING_SPECIAL)
{
make_ui_sound("UISndNewIncomingGroupIMSession");
}
}
else if(!gAgent.isDoNotDisturb() && PlayModeUISndNewIncomingIMSession == 2 && dialog == IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingIMSession == 2 && dialog == IM_NOTHING_SPECIAL)
{
make_ui_sound("UISndNewIncomingIMSession");
}
else if(!gAgent.isDoNotDisturb() && PlayModeUISndNewIncomingGroupIMSession == 2 && dialog != IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession == 2 && dialog != IM_NOTHING_SPECIAL)
{
make_ui_sound("UISndNewIncomingGroupIMSession");
// </FS:PP>
}
// <FS:WoLf> IM Sounds only for sessions not in focus
else if(!gAgent.isDoNotDisturb() && PlayModeUISndNewIncomingIMSession == 3 && dialog == IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingIMSession == 3 && dialog == IM_NOTHING_SPECIAL)
{
// <FS:Ansariel> [FS communication UI]
//LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);
@ -3012,7 +3013,7 @@ void LLIMMgr::addMessage(
make_ui_sound("UISndNewIncomingIMSession");
}
}
else if(!gAgent.isDoNotDisturb() && PlayModeUISndNewIncomingGroupIMSession == 3 && dialog != IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession == 3 && dialog != IM_NOTHING_SPECIAL)
{
// <FS:Ansariel> [FS communication UI]
//LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);