diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-07-09 14:03:08 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-07-09 14:03:08 -0400 |
| commit | 033c84dc9452f4b38cdf87446203241c4554d126 (patch) | |
| tree | 726cbce3e094e5bc8440a3a5c6a8e7e4f3265693 /indra/newview/llviewerobject.h | |
| parent | 6d6377608e7f045b7031f4c2b94efb816003286e (diff) | |
SH-3171 FIX switched texture pipeline to use the new cap request URL
If we support server side texture baking, requests for baked textures will
go through the http url received at login.
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index c8152e1539..b380e9b8ce 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -314,6 +314,7 @@ public: /*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 ); /*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); |