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

Fixed CHUI merge bug with FIRE-7556: Configurable User Interface sounds

master
Kadah_Coba 2013-07-04 20:17:06 -07:00
parent c0aa1c9301
commit 4a3ec80ef1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llui.cpp
View File

@ -139,7 +139,7 @@ LLUUID find_ui_sound(const char * namep, bool force_sound) //LL post CHUI
if (name != "UISndNewIncomingIMSession" && name != "UISndNewIncomingGroupIMSession") // There is no need to process these two, checks are in llimview.cpp already, in LLIMMgr::addMessage
{
if (!force_sound && ( (name != "UISndSnapshot" && !LLUI::sSettingGroups["config"]->getBOOL("PlayMode"+name)) || (name == "UISndSnapshot" && LLUI::sSettingGroups["config"]->getBOOL("PlayModeUISndSnapshot")) ) )
return uuid;
return LLUUID(NULL);
}
// </FS:PP>