diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-04 18:13:26 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-04 18:13:26 -0700 |
| commit | 8e027971a28e9c4701ec667e52b56bf5deda6ce2 (patch) | |
| tree | 1a6ac9111f9b8ba5bb921bbaf83d403f7b394ed5 /indra/newview/llviewerobject.cpp | |
| parent | d3c1fdeb34b91bb87e75932e2269f46234303335 (diff) | |
Remove unnecessary assert as ternary protects against null ptr deref
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 7c50abf53b..b8321c805f 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4100,7 +4100,6 @@ S32 LLViewerObject::setTETextureCore(const U8 te, LLViewerTexture *image) S32 LLViewerObject::setTENormalMapCore(const U8 te, LLViewerTexture *image) { - llassert(image); S32 retval = TEM_CHANGE_TEXTURE; const LLUUID& uuid = image ? image->getID() : LLUUID::null; if (uuid != getTE(te)->getID() || |