diff options
author | McCabe Maxsted | 2010-07-16 00:55:50 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-07-16 00:55:50 -0700 |
commit | 4008adb2b19d7bcc62502754dc1a4fc4a86f50dc (patch) | |
tree | c3b488469761740592aed0bd300e702a610f67e6 | |
parent | Feature #277: added the grid manager to Preferences > General and changed the... (diff) | |
download | meta-impy-4008adb2b19d7bcc62502754dc1a4fc4a86f50dc.zip meta-impy-4008adb2b19d7bcc62502754dc1a4fc4a86f50dc.tar.gz meta-impy-4008adb2b19d7bcc62502754dc1a4fc4a86f50dc.tar.bz2 meta-impy-4008adb2b19d7bcc62502754dc1a4fc4a86f50dc.tar.xz |
Always play sounds regardless of maturity
-rw-r--r-- | linden/indra/newview/llviewerobject.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp index 7a1d50f..6e74caf 100644 --- a/linden/indra/newview/llviewerobject.cpp +++ b/linden/indra/newview/llviewerobject.cpp | |||
@@ -4389,12 +4389,14 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow | |||
4389 | mAudioSourcep->play(LLUUID::null); | 4389 | mAudioSourcep->play(LLUUID::null); |
4390 | } | 4390 | } |
4391 | 4391 | ||
4392 | // Play this sound if region maturity permits | 4392 | /*// Play this sound if region maturity permits |
4393 | if( gAgent.canAccessMaturityAtGlobal(this->getPositionGlobal()) ) | 4393 | if( gAgent.canAccessMaturityAtGlobal(this->getPositionGlobal()) ) |
4394 | { | 4394 | { |
4395 | //llinfos << "Playing attached sound " << audio_uuid << llendl; | 4395 | //llinfos << "Playing attached sound " << audio_uuid << llendl; |
4396 | mAudioSourcep->play(audio_uuid); | 4396 | mAudioSourcep->play(audio_uuid); |
4397 | } | 4397 | }*/ |
4398 | // Actually, always play sounds regardless of maturity -- MC | ||
4399 | mAudioSourcep->play(audio_uuid); | ||
4398 | } | 4400 | } |
4399 | } | 4401 | } |
4400 | 4402 | ||