From b29b13ad98c5c79fd63bae10b4b099a03fa9dc35 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Dec 2008 14:03:10 -0600
Subject: Updated audio engine to LL's openal branch r1532.

---
 linden/indra/newview/llviewermessage.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'linden/indra/newview/llviewermessage.cpp')

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 0e39026..260265e 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3308,8 +3308,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 		return;
 	}
 
-	F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : (gain * gSavedSettings.getF32("AudioLevelSFX"));
-	gAudiop->triggerSound(sound_id, owner_id, volume, pos_global);
+	gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
 
 void process_preload_sound(LLMessageSystem *msg, void **user_data)
-- 
cgit v1.1


From c9ad0b4828ae6c70d6e1b7610a247a6ef48465fd Mon Sep 17 00:00:00 2001
From: Anders Arnholm
Date: Fri, 12 Dec 2008 09:27:40 +0100
Subject: Applied 3 patches from CoolViewer, http://sldev.free.fr

Applied slviewer-0-v120130-LandmarksDiscardButton_v2.patch.bz2
Applied slviewer-0-v120160-FriendshipAndCallingcardOffersIgnoreButton.patch.bz2
Applied slviewer-0-v12100-AllowDiscardForCreator.patch.bz2
---
 linden/indra/newview/llviewermessage.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/llviewermessage.cpp')

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 0e39026..3c7a0ab 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -833,9 +833,9 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 		//if we are throttled, don't display them - Gigs
 		if (check_offer_throttle(from_name, false))
 		{
-			// I'm not sure this is a good idea.  JC
-			bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
-			//bool show_keep_discard = true;
+			// I'm not sure this is a good idea.  JC  -  Definitely a bad idea.  HB
+			//bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
+			bool show_keep_discard = true;
 			switch(asset_type)
 			{
 			case LLAssetType::AT_NOTECARD:
-- 
cgit v1.1