diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-04 11:08:14 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-04 11:08:14 -0400 |
| commit | e3b4b3875a6d8c7857ba948a662ace4731913ecf (patch) | |
| tree | 8ea52e8470403b101218da6c3cad1634637c7088 /indra/newview/llvovolume.cpp | |
| parent | fa449e17e54de81494d5efbf30f201b7e3371fe0 (diff) | |
| parent | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (diff) | |
merge changes for DRTVWR-207
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 9c36cfee59..e99898a83c 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); |