From 99f4be4bdfbf09d8ca70f3d11b5307f23bd539c9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 31 Jul 2015 17:09:28 +0200 Subject: [PATCH] FIRE-16485: Crash when calling texture refresh on an object that has a blacklisted copy --- indra/newview/pipeline.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7c848fedb8..a5601fb25b 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3438,7 +3438,10 @@ void LLPipeline::markRebuild(LLDrawable *drawablep, LLDrawable::EDrawableFlags f mBuildQ2.push_back(drawablep); drawablep->setState(LLDrawable::IN_REBUILD_Q2); // need flag here because it is just a list } - if (flag & (LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION)) + // FIRE-16485: Crash when calling texture refresh on an object that has a blacklisted copy + //if (flag & (LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION)) + if ((flag & (LLDrawable::REBUILD_VOLUME | LLDrawable::REBUILD_POSITION)) && drawablep->getVObj().notNull()) + // { drawablep->getVObj()->setChanged(LLXform::SILHOUETTE); }