diff options
| author | AndreyL ProductEngine <none@none> | 2018-02-12 21:15:00 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <none@none> | 2018-02-12 21:15:00 +0200 |
| commit | e6765df1baa40a46b77e5362c8855a336125e5f7 (patch) | |
| tree | ffb3564aaa95b23f0d7ab6f6eeea8d08f3e9b317 /indra/newview/llviewerpartsim.cpp | |
| parent | b0950991988ddd56bec9074316d883a00b0cae4c (diff) | |
| parent | 02342cb9ae3140cb49ec2818fee5692b3796bf8a (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
| -rw-r--r-- | indra/newview/llviewerpartsim.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index b066793e3d..25cf082751 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -756,7 +756,7 @@ void LLViewerPartSim::updateSimulation() LLViewerObject* vobj = mViewerPartGroups[i]->mVOPartGroupp; S32 visirate = 1; - if (vobj) + if (vobj && !vobj->isDead() && vobj->mDrawable && !vobj->mDrawable->isDead()) { LLSpatialGroup* group = vobj->mDrawable->getSpatialGroup(); if (group && !group->isVisible()) // && !group->isState(LLSpatialGroup::OBJECT_DIRTY)) @@ -767,7 +767,7 @@ void LLViewerPartSim::updateSimulation() if ((LLDrawable::getCurrentFrame()+mViewerPartGroups[i]->mID)%visirate == 0) { - if (vobj) + if (vobj && !vobj->isDead()) { gPipeline.markRebuild(vobj->mDrawable, LLDrawable::REBUILD_ALL, TRUE); } |