diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-22 19:53:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-22 19:53:16 +0100 |
| commit | 264b549bcb991f4cdd6889f06b8f7fbe8740e32a (patch) | |
| tree | e44ab0815be80e8e66ef80919dcc4fea81ce53a0 /indra/newview/llviewerobject.cpp | |
| parent | 8fdb82bec5c54ba8609b6968b058a50856a5ed8c (diff) | |
| parent | 5b2d4a169830c10dd5bfc4c72ddd94ef80e658d3 (diff) | |
merge storm-163 / Port of VWR-14914 to SG 2.0 : Intermittent FPS drop related to "audio" (main thread hangs often on openal lock)
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 741a9e6ec4..fd3e80d755 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4445,6 +4445,13 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow mAudioSourcep = NULL; } + if (mAudioSourcep && mAudioSourcep->isMuted() && + mAudioSourcep->getCurrentData() && mAudioSourcep->getCurrentData()->getID() == audio_uuid) + { + //llinfos << "Already having this sound as muted sound, ignoring" << llendl; + return; + } + getAudioSource(owner_id); if (mAudioSourcep) |