diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-04 16:45:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-04 16:45:04 -0500 |
| commit | 346ee6595d395a92a1445441467971510e6f4b6d (patch) | |
| tree | 0827969b1bc9675f4046c87aedf6ec935ed938c8 /indra/newview/llviewerpartsim.cpp | |
| parent | ef514c800159218eca634d199890d835bb118353 (diff) | |
| parent | 9c727eb2fb9924f0b67fb1e4d0e1cdaf2f20e969 (diff) | |
merge latest changes from ruslan
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
| -rwxr-xr-x | indra/newview/llviewerpartsim.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index ab510c1e95..b4617566ac 100755 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -705,7 +705,13 @@ void LLViewerPartSim::updateSimulation() { BOOL upd = TRUE; LLViewerObject* vobj = mViewerPartSources[i]->mSourceObjectp; - if (vobj && (vobj->getPCode() == LL_PCODE_VOLUME)) + + if (vobj && vobj->isAvatar() && ((LLVOAvatar*)vobj)->isInMuteList()) + { + upd = FALSE; + } + + if (upd && vobj && (vobj->getPCode() == LL_PCODE_VOLUME)) { if(vobj->getAvatar() && vobj->getAvatar()->isTooComplex()) { |