diff options
Diffstat (limited to 'linden/indra/newview/llpreviewsound.cpp')
-rw-r--r-- | linden/indra/newview/llpreviewsound.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
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 @@ | |||
28 | 28 | ||
29 | #include "llviewerprecompiledheaders.h" | 29 | #include "llviewerprecompiledheaders.h" |
30 | 30 | ||
31 | #include "llpreviewsound.h" | 31 | #include "audioengine.h" |
32 | #include "llagent.h" // gAgent | ||
32 | #include "llbutton.h" | 33 | #include "llbutton.h" |
33 | #include "llresmgr.h" | ||
34 | #include "llinventory.h" | 34 | #include "llinventory.h" |
35 | #include "llinventoryview.h" | 35 | #include "llinventoryview.h" |
36 | #include "audioengine.h" | ||
37 | #include "llviewermessage.h" // send_guid_sound_trigger | ||
38 | #include "llagent.h" // gAgent | ||
39 | #include "lllineeditor.h" | 36 | #include "lllineeditor.h" |
37 | #include "llpreviewsound.h" | ||
38 | #include "llresmgr.h" | ||
39 | #include "llviewercontrol.h" | ||
40 | #include "llviewermessage.h" // send_guid_sound_trigger | ||
40 | #include "llvieweruictrlfactory.h" | 41 | #include "llvieweruictrlfactory.h" |
41 | 42 | ||
42 | extern LLAudioEngine* gAudiop; | 43 | extern LLAudioEngine* gAudiop; |
@@ -102,7 +103,7 @@ void LLPreviewSound::auditionSound( void *userdata ) | |||
102 | if(item && gAudiop) | 103 | if(item && gAudiop) |
103 | { | 104 | { |
104 | LLVector3d lpos_global = gAgent.getPositionGlobal(); | 105 | LLVector3d lpos_global = gAgent.getPositionGlobal(); |
105 | 106 | F32 volume = SOUND_GAIN * gSavedSettings.getF32("AudioLevelSFX"); | |
106 | gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, lpos_global); | 107 | gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), volume, lpos_global); |
107 | } | 108 | } |
108 | } | 109 | } |