From 2056841a0d07cd78d66c395dd57b8142d633d117 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Sat, 29 Jun 2013 22:26:24 -0600
Subject: [PATCH] Fix linker error caused by a typo in make_ui_sound_deferred

---
 indra/llui/llui.cpp                                 | 2 +-
 indra/llui/llui.h                                   | 4 +++-
 indra/newview/lldonotdisturbnotificationstorage.cpp | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 39d68e6df1..363ea00b40 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -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())
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 2d09682eeb..d67ef7a1e1 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -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;
 
diff --git a/indra/newview/lldonotdisturbnotificationstorage.cpp b/indra/newview/lldonotdisturbnotificationstorage.cpp
index 82affcf068..d3a2233f39 100644
--- a/indra/newview/lldonotdisturbnotificationstorage.cpp
+++ b/indra/newview/lldonotdisturbnotificationstorage.cpp
@@ -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)