From 35b757d6c00fdda7fd483c57df59e9ef3f9d0c0b Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 10 Jul 2012 20:12:31 +0200
Subject: [PATCH] Crashfix: Don't blindly trust getImage() returns a valid
 pointer.

---
 indra/newview/llvoavatar.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 113a71f3a9..961fc4cba3 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -9102,6 +9102,11 @@ BOOL LLVOAvatar::isTextureDefined(LLVOAvatarDefines::ETextureIndex te, U32 index
 		return FALSE;
 	}
 
+	// <FS:ND> getImage(te, index) can return 0 in some edge cases.
+	if( !getImage( te, index ) )
+		return FALSE;
+	// </FS:ND>
+
 	return (getImage(te, index)->getID() != IMG_DEFAULT_AVATAR && 
 			getImage(te, index)->getID() != IMG_DEFAULT);
 }