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 | |
| parent | fa449e17e54de81494d5efbf30f201b7e3371fe0 (diff) | |
| parent | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (diff) | |
merge changes for DRTVWR-207
| -rwxr-xr-x | .hgtags | 3 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llvovolume.h | 1 |
5 files changed, 18 insertions, 2 deletions
@@ -305,6 +305,9 @@ b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2 7649a3dff5ec22d3727377e5f02efd0f421e4cb5 DRTVWR-201 84fb70dfe3444e75a44fb4bee43e2fc8221cebdd 3.4.0-beta4 de3be913f68813a9bac7d1c671fef96d1159bcd6 DRTVWR-202 +573e863be2f26d3687161def4b9fea9b7038dda8 3.4.0-beta5 34dbbe2b00afe90352d3acf8290eb10ab90d1c8b oz-build-test-tag 6ee71714935ffcd159db3d4f5800c1929aac54e1 DRTVWR-205 7b22c612fc756e0ea63b10b163e81d107f85dbf8 DRTVWR-206 +8c9085066c78ed5f6c9379dc054c82a6fcdb1851 DRTVWR-207 +351eea5f9dc192fc5ddea3b02958de97677a0a12 3.3.4-release3 diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b2e6dc4571..444bbb2776 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4080,7 +4080,7 @@ S32 LLViewerObject::setTETextureCore(const U8 te, const LLUUID& uuid, LLHost hos return retval; } - +//virtual void LLViewerObject::changeTEImage(S32 index, LLViewerTexture* new_image) { if(index < 0 || index >= getNumTEs()) diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 22e0de681e..277bd1c430 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -322,7 +322,7 @@ public: /*virtual*/ S32 setTEGlow(const U8 te, const F32 glow); /*virtual*/ BOOL setMaterial(const U8 material); virtual void setTEImage(const U8 te, LLViewerTexture *imagep); // Not derived from LLPrimitive - void changeTEImage(S32 index, LLViewerTexture* new_image) ; + virtual void changeTEImage(S32 index, LLViewerTexture* new_image) ; LLViewerTexture *getTEImage(const U8 te) const; void fitFaceTexture(const U8 face); 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); diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h index 0082f2e991..5482c80f2b 100644 --- a/indra/newview/llvovolume.h +++ b/indra/newview/llvovolume.h @@ -173,6 +173,7 @@ public: /*virtual*/ void setScale(const LLVector3 &scale, BOOL damped); + /*virtual*/ void changeTEImage(S32 index, LLViewerTexture* new_image) ; /*virtual*/ void setNumTEs(const U8 num_tes); /*virtual*/ void setTEImage(const U8 te, LLViewerTexture *imagep); /*virtual*/ S32 setTETexture(const U8 te, const LLUUID &uuid); |