diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-23 12:56:31 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-23 12:56:31 -0700 |
| commit | 92195c479f597538a55dfa8b2e02c1b4908a2259 (patch) | |
| tree | 2af86834aa11e66f7e74057f4172d29dfd0703e7 /indra/newview/llviewerobject.cpp | |
| parent | 78e52f40424cb8336ab5d06c9ea37e16cb2b40a7 (diff) | |
| parent | 18bd7dfae789ce0d6be3de3811d6d779fc4ec63e (diff) | |
Merged support for platform specific permanent quick links to the installer
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) |