diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-05 18:23:31 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-05 18:23:31 +0000 |
| commit | 9f6c8459021f284011a89410a44b62f0e108352c (patch) | |
| tree | 00f3ef34008c4d10ae5fdb229192731b94a059ad /indra/newview/llvovolume.cpp | |
| parent | 825cc7873251ad90720ab40221d689abed7b2ac8 (diff) | |
| parent | e3b4b3875a6d8c7857ba948a662ace4731913ecf (diff) | |
Merge viewer-development -> VirLinden/sunshine
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); |