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

Fix linker error caused by a typo in make_ui_sound_deferred

master
Cinders 2013-06-29 22:26:24 -06:00
parent ba4c199bb4
commit 2056841a0d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llui.cpp
View File

@ -164,7 +164,7 @@ void make_ui_sound(const char* namep, bool force_sound)
}
//void make_ui_sound_deferred(const char* namep)
void mame_ui_sound_deferred(const char* namep, bool force_sound)
void make_ui_sound_deferred(const char* namep, bool force_sound)
{
LLUUID soundUUID = find_ui_sound(namep, force_sound);
if(soundUUID.notNull())

4
indra/llui/llui.h
View File

@ -57,7 +57,9 @@ class LLHelp;
// void make_ui_sound(const char* name);
void make_ui_sound(const char* name, bool force_sound = false);
// </FS:PP> UI Sounds preview
void make_ui_sound_deferred(const char * name); //<FS:TM> CHUI Merge check
// <FS:CR>
//void make_ui_sound_deferred(const char * name);
void make_ui_sound_deferred(const char* name, bool force_sound = false);
class LLImageProviderInterface;

5
indra/newview/lldonotdisturbnotificationstorage.cpp
View File

@ -222,7 +222,10 @@ void LLDoNotDisturbNotificationStorage::loadNotifications()
if(imToastExists || group_ad_hoc_toast_exists || offerExists)
{
make_ui_sound_deferred("UISndNewIncomingIMSession");
// <FS:CR> CHUI merge
//make_ui_sound_deferred("UISndNewIncomingIMSession");
make_ui_sound_deferred("UISndNewIncomingIMSession", false);
// </FS:CR>
}
//writes out empty .xml file (since LLCommunicationChannel::mHistory is empty)