diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-05 18:26:26 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-09-05 18:26:26 -0400 |
commit | 259857b34ee0f9cbb8af6fb66f8ac280baac7b52 (patch) | |
tree | 19c04829f2ece21ab0f5f1c63abc71a0dce24f94 /indra/newview/llvovolume.cpp | |
parent | 201d9853f9d57efab9b819ff07745141a5265e98 (diff) | |
parent | 9f6c8459021f284011a89410a44b62f0e108352c (diff) |
merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r-- | indra/newview/llvovolume.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index b43bdb69f8..2ad3ff50b8 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1803,6 +1803,18 @@ void LLVOVolume::setNumTEs(const U8 num_tes) return ; } +//virtual +void LLVOVolume::changeTEImage(S32 index, LLViewerTexture* imagep) +{ + BOOL changed = (mTEImages[index] != imagep); + LLViewerObject::changeTEImage(index, imagep); + if (changed) + { + gPipeline.markTextured(mDrawable); + mFaceMappingChanged = TRUE; + } +} + void LLVOVolume::setTEImage(const U8 te, LLViewerTexture *imagep) { BOOL changed = (mTEImages[te] != imagep); |