diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-01-30 18:23:31 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-01-30 18:23:31 -0500 |
| commit | c24c974cc6a7df3a1df7f7a24ad52275430b18dd (patch) | |
| tree | 454409ec209f2685f859029ba88e6fdef3bb1064 /indra/newview/llviewerobject.h | |
| parent | 3a7e3eacb86989c936cd6960cfa7434f3b8232fc (diff) | |
SH-3800 WIP - logic to detect baked textures being sought in the wrong place, avoid querying textures for which we have no authoritative data where they live
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerobject.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 889025962c..728d279c39 100644..100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -301,8 +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, const LLUUID& uuid, const std::string &url ); + 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); |