1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index a8001699fe..9e504402c8 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -577,8 +577,11 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color)
                 }
             }
             // Draw the selection marker using the correctly chosen vertex buffer
-            vertex_buffer->setBuffer();
-            vertex_buffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
+            if (vertex_buffer)
+            {
+                vertex_buffer->setBuffer();
+                vertex_buffer->draw(LLRender::TRIANGLES, mIndicesCount, mIndicesIndex);
+            }
         }
 
         gGL.popMatrix();