From 0517fe4322443bdc317f8185590a63134e3f8394 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 13 Jun 2009 13:17:14 -0500
Subject: Second Life viewer sources 1.23.3-RC

---
 linden/indra/newview/llface.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'linden/indra/newview/llface.cpp')

diff --git a/linden/indra/newview/llface.cpp b/linden/indra/newview/llface.cpp
index 3dfe6a2..69edcca 100644
--- a/linden/indra/newview/llface.cpp
+++ b/linden/indra/newview/llface.cpp
@@ -1150,6 +1150,21 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 BOOL LLFace::verify(const U32* indices_array) const
 {
 	BOOL ok = TRUE;
+
+	if( mVertexBuffer.isNull() )
+	{
+		if( mGeomCount )
+		{
+			// This happens before teleports as faces are torn down.
+			// Stop the crash in DEV-31893 with a null pointer check,
+			// but present this info.
+			// To clean up the log, the geometry could be cleared, or the
+			// face could otherwise be marked for no ::verify.
+			llinfos << "Face with no vertex buffer and " << mGeomCount << " mGeomCount" << llendl;
+		}
+		return TRUE;
+	}
+	
 	// First, check whether the face data fits within the pool's range.
 	if ((mGeomIndex + mGeomCount) > mVertexBuffer->getNumVerts())
 	{
-- 
cgit v1.1