diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-11 11:30:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-11 11:30:20 -0400 |
| commit | 4165f2eac869d7c94da15046823389049fac2231 (patch) | |
| tree | b5199feaa68f38bebdd21f22c65f9492cf8d14eb /indra/newview/llviewerobject.cpp | |
| parent | d47a436815a43e4c55fd9fc60aa3876a9d7f815f (diff) | |
| parent | 9b632f060b7b9dcd33858b5c31d538760d0666ae (diff) | |
merge latest integration repo changes
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 25b97b104b..0842526e9e 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -201,6 +201,8 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe mTotalCRC(0), mListIndex(-1), mTEImages(NULL), + mTENormalMaps(NULL), + mTESpecularMaps(NULL), mGLName(0), mbCanSelect(TRUE), mFlags(0), @@ -321,6 +323,18 @@ void LLViewerObject::deleteTEImages() { delete[] mTEImages; mTEImages = NULL; + + if (mTENormalMaps != NULL) + { + delete[] mTENormalMaps; + mTENormalMaps = NULL; + } + + if (mTESpecularMaps != NULL) + { + delete[] mTESpecularMaps; + mTESpecularMaps = NULL; + } } void LLViewerObject::markDead() |