diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-05 18:36:50 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-05 18:36:50 +0000 |
| commit | 2cb3b8ef6bbfa328e35b9c066f0b5c3ceebba55f (patch) | |
| tree | 0598fdb8113a77b2817f61ab7965f2e5e03c5756 /indra/newview/llviewerobject.h | |
| parent | 41301004e13bec1c74f444f42372a3a6609cb305 (diff) | |
| parent | 9f6c8459021f284011a89410a44b62f0e108352c (diff) | |
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
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 dd02dce716..1f70f7ac3c 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -323,7 +323,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); |