From 117e22047c5752352342d64e3fb7ce00a4eb8113 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:04 -0500
Subject: Second Life viewer sources 1.18.1.2

---
 linden/indra/newview/llpreviewsound.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp
index 4e12cd0..7c7afe6 100644
--- a/linden/indra/newview/llpreviewsound.cpp
+++ b/linden/indra/newview/llpreviewsound.cpp
@@ -28,15 +28,16 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "llpreviewsound.h"
+#include "audioengine.h"
+#include "llagent.h"          // gAgent
 #include "llbutton.h"
-#include "llresmgr.h"
 #include "llinventory.h"
 #include "llinventoryview.h"
-#include "audioengine.h"
-#include "llviewermessage.h"  // send_guid_sound_trigger
-#include "llagent.h"          // gAgent
 #include "lllineeditor.h"
+#include "llpreviewsound.h"
+#include "llresmgr.h"
+#include "llviewercontrol.h"
+#include "llviewermessage.h"  // send_guid_sound_trigger
 #include "llvieweruictrlfactory.h"
 
 extern LLAudioEngine* gAudiop;
@@ -102,7 +103,7 @@ void LLPreviewSound::auditionSound( void *userdata )
 	if(item && gAudiop)
 	{
 		LLVector3d lpos_global = gAgent.getPositionGlobal();
-				
-		gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, lpos_global);
+		F32 volume = SOUND_GAIN * gSavedSettings.getF32("AudioLevelSFX");
+		gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), volume, lpos_global);
 	}
 }
-- 
cgit v1.1