diff options
| author | Jacek Antonelli | 2009-01-13 00:19:34 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-01-13 00:19:34 -0600 |
| commit | 106b2a600c59404ef6bb95b77f8bbf271b659baa (patch) | |
| tree | 4f9394f0ca34003347de3dffff40efd8a3a43c6c /linden/indra/newview/llpreviewsound.cpp | |
| parent | Merge 1.1.0 alpha into quickfilter (diff) | |
| parent | Merge commit 'mccabe/1.1.0a-gstreamer' into 1.1.0a (diff) | |
| download | meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.zip meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.gz meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.bz2 meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.xz | |
Merge branch '1.1.0a-gstreamer' into next
Diffstat (limited to 'linden/indra/newview/llpreviewsound.cpp')
| -rw-r--r-- | linden/indra/newview/llpreviewsound.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/newview/llpreviewsound.cpp b/linden/indra/newview/llpreviewsound.cpp index 9ba6fd5..6b79bfb 100644 --- a/linden/indra/newview/llpreviewsound.cpp +++ b/linden/indra/newview/llpreviewsound.cpp | |||
| @@ -106,7 +106,6 @@ void LLPreviewSound::auditionSound( void *userdata ) | |||
| 106 | if(item && gAudiop) | 106 | if(item && gAudiop) |
| 107 | { | 107 | { |
| 108 | LLVector3d lpos_global = gAgent.getPositionGlobal(); | 108 | LLVector3d lpos_global = gAgent.getPositionGlobal(); |
| 109 | F32 volume = gSavedSettings.getBOOL("MuteSounds") ? 0.f : SOUND_GAIN * gSavedSettings.getF32("AudioLevelSFX"); | 109 | gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, lpos_global); |
| 110 | gAudiop->triggerSound(item->getAssetUUID(), gAgent.getID(), volume, lpos_global); | ||
| 111 | } | 110 | } |
| 112 | } | 111 | } |