diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 20:23:57 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 20:23:57 +0000 |
| commit | c2c5e672e25d3272db0b062c3831abded6db9141 (patch) | |
| tree | fa6ba40f4609073d96f20460fcc8e38f8b8e1bf7 /indra/newview/llvovolume.cpp | |
| parent | 456968de657f17de4757e95b87350b2564e54f71 (diff) | |
| parent | 4e94745139ea116b1779035e1b303a9fcc92f315 (diff) | |
Merged in DV510-merge-6.4.8 (pull request #243)
Merge master 6.4.8 into DRTVWR-510
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index f6669c44e5..98eb2d3cdc 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -261,7 +261,10 @@ void LLVOVolume::markDead() { if (!mDead) { - LLSculptIDSize::instance().rem(getVolume()->getParams().getSculptID()); + if (getVolume()) + { + LLSculptIDSize::instance().rem(getVolume()->getParams().getSculptID()); + } if(getMDCImplCount() > 0) { |