diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index b12927e8da..8def4272a4 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -2913,6 +2913,7 @@ void LLIMMgr::addMessage( // Configurable IM sounds static LLCachedControl PlayModeUISndNewIncomingIMSession(gSavedSettings, "PlayModeUISndNewIncomingIMSession"); static LLCachedControl PlayModeUISndNewIncomingGroupIMSession(gSavedSettings, "PlayModeUISndNewIncomingGroupIMSession"); + BOOL do_not_disturb = gAgent.isDoNotDisturb(); // Configurable IM sounds bool new_session = !hasSession(new_session_id); @@ -2982,26 +2983,26 @@ void LLIMMgr::addMessage( // 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"); // } // 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 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 communication UI] //LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);