diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/newview/llpreviewsound.cpp | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/newview/llpreviewsound.cpp')
| -rw-r--r-- | indra/newview/llpreviewsound.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp index 7df0e48762..22b47eb8ca 100644 --- a/indra/newview/llpreviewsound.cpp +++ b/indra/newview/llpreviewsound.cpp @@ -8,15 +8,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; @@ -82,7 +83,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); } } |