diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
| commit | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (patch) | |
| tree | c1581bcf34e96a897c6e1d9a4aed95f353713baa /indra/newview/llviewerobject.cpp | |
| parent | 55c25229b79b1755c989e5996c8e8d118f369721 (diff) | |
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 60fc733cb5..d32eb6414c 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -240,8 +240,11 @@ LLViewerObject::~LLViewerObject() std::map<U16, ExtraParameter*>::iterator iter; for (iter = mExtraParameterList.begin(); iter != mExtraParameterList.end(); ++iter) { - delete iter->second->data; - delete iter->second; + if(iter->second != NULL) + { + delete iter->second->data; + delete iter->second; + } } mExtraParameterList.clear(); @@ -3650,7 +3653,12 @@ S32 LLViewerObject::setTETexture(const U8 te, const LLUUID& uuid) } -S32 LLViewerObject::setTEColor(const U8 te, const LLColor4 &color) +S32 LLViewerObject::setTEColor(const U8 te, const LLColor3& color) +{ + return setTEColor(te, LLColor4(color)); +} + +S32 LLViewerObject::setTEColor(const U8 te, const LLColor4& color) { S32 retval = 0; const LLTextureEntry *tep = getTE(te); @@ -4855,7 +4863,7 @@ void LLViewerObject::dirtySpatialGroup() const } } -void LLViewerObject::dirtyMesh() const +void LLViewerObject::dirtyMesh() { if (mDrawable) { |