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 | e0f2a242a7f67f7fa6181fbd65b6cea3a20facc4 (patch) | |
| tree | 4c79a80fd161f9b433ddfca4d74456567a1e3873 /indra/newview | |
| parent | 930dfc4f17e7a8b2dba9f58a2d9a4f0a46fae408 (diff) | |
Remove unnecessary assert as ternary protects against null ptr deref
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | 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 ee7003ae30..c020ee36d3 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4086,7 +4086,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() || |