summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerpartsim.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-02-09 14:19:31 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-02-09 14:19:31 +0200
commitbd786ada4f773b0ba13536f26a7858bd9ad69791 (patch)
treece884962fa6b5a5a1d342c42b667a7a73f9512fc /indra/newview/llviewerpartsim.cpp
parentb10e46167b7aa3b44c4d2fb3fcdcbdc4f6e11096 (diff)
MAINT-8279 Fix for crash on unset pcode
Diffstat (limited to 'indra/newview/llviewerpartsim.cpp')
-rw-r--r--indra/newview/llviewerpartsim.cpp4
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);
}