1 files changed, 12 insertions, 1 deletions

diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index 28aeb29..fbf753a 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -151,7 +151,7 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
 
         if (!num_parts)
         {
-                if (drawable->getNumFaces())
+                if (group && drawable->getNumFaces())
                 {
                         group->dirtyGeom();
                 }
@@ -206,6 +206,12 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
                 count++;
 
                 facep = drawable->getFace(i);
+                if (!facep)
+                {
+                        llwarns << "No face found for index " << i << "!" << llendl;
+                        continue;
+                }
+
                 facep->setTEOffset(i);
                 const F32 NEAR_PART_DIST_SQ = 5.f*5.f;  // Only discard particles > 5 m from the camera
                 const F32 MIN_PART_AREA = .005f*.005f;  // only less than 5 mm x 5 mm at 1 m from camera
@@ -259,6 +265,11 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
         for (i = count; i < drawable->getNumFaces(); i++)
         {
                 LLFace* facep = drawable->getFace(i);
+                if (!facep)
+                {
+                        llwarns << "No face found for index " << i << "!" << llendl;
+                        continue;
+                }
                 facep->setTEOffset(i);
                 facep->setSize(0,0);
         }