aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-03-18 12:48:00 -0700
committerMcCabe Maxsted2011-03-18 13:14:19 -0700
commit07d67729f0052944b94bf1ecc9b0bc9690db20ad (patch)
treece853718c29eede2749863167ae6df5594f5d17f /linden/indra/newview/llvovolume.cpp
parentFixed missing use_prebuilt_binary(gstreamer-plugins) from GStreamer010Plugin.... (diff)
downloadmeta-impy-07d67729f0052944b94bf1ecc9b0bc9690db20ad.zip
meta-impy-07d67729f0052944b94bf1ecc9b0bc9690db20ad.tar.gz
meta-impy-07d67729f0052944b94bf1ecc9b0bc9690db20ad.tar.bz2
meta-impy-07d67729f0052944b94bf1ecc9b0bc9690db20ad.tar.xz
Added a null check for corrupt volume lists
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvovolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 204d641..7aaf845 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -785,7 +785,7 @@ void LLVOVolume::sculpt()
785 for (S32 i = 0; i < mSculptTexture->getNumVolumes(); ++i) 785 for (S32 i = 0; i < mSculptTexture->getNumVolumes(); ++i)
786 { 786 {
787 LLVOVolume* volume = (*(mSculptTexture->getVolumeList()))[i]; 787 LLVOVolume* volume = (*(mSculptTexture->getVolumeList()))[i];
788 if (volume != this && volume->getVolume() == getVolume()) 788 if (volume && volume != this && volume->getVolume() == getVolume())
789 { 789 {
790 gPipeline.markRebuild(volume->mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE); 790 gPipeline.markRebuild(volume->mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE);
791 } 791 }