diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
| commit | edf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch) | |
| tree | 68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/newview/llviewerobject.h | |
| parent | 01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
pull changes for Sunshine beta
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 97cf0a4850..728d279c39 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -301,7 +301,7 @@ public: /*virtual*/ void setNumTEs(const U8 num_tes); /*virtual*/ void setTE(const U8 te, const LLTextureEntry &texture_entry); /*virtual*/ S32 setTETexture(const U8 te, const LLUUID &uuid); - S32 setTETextureCore(const U8 te, const LLUUID& uuid, LLHost host); + S32 setTETextureCore(const U8 te, LLViewerTexture *image); /*virtual*/ S32 setTEColor(const U8 te, const LLColor3 &color); /*virtual*/ S32 setTEColor(const U8 te, const LLColor4 &color); /*virtual*/ S32 setTEScale(const U8 te, const F32 s, const F32 t); |