diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-31 16:28:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-31 16:28:24 -0400 |
| commit | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (patch) | |
| tree | 3fca1895d3b0f8d97d831ccbd79c74f189f7b2dc /indra/newview/llviewerobject.h | |
| parent | dab915c1d2a2d08363944de8ac4362fbe162bea0 (diff) | |
| parent | 7f0b247d4b6ce03e92ee3e80e8f7a2027813ea0c (diff) | |
merge changes for
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 05d017dee3..b2aafcfc20 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -336,7 +336,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); |