diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-02 13:46:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-02 13:46:19 -0500 |
| commit | 9c727eb2fb9924f0b67fb1e4d0e1cdaf2f20e969 (patch) | |
| tree | 4118e295bdf310489ae322405cbbc63f57a78161 /indra/newview/llviewerpartsim.cpp | |
| parent | 2ed1fd432ae40df91343f8c21dc6ed80abca9f0e (diff) | |
| parent | 0ffc4f2667806653d1f0548fdda7eb91bdea5025 (diff) | |
Merged in ruslantproductengine/ruslanteliuk-391-blizzard (pull request #21)
MAINT-5700 [QuickGraphics-RC] Blocked avatars should always be derendered
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()) { |