diff options
author | thickbrick | 2010-10-16 03:16:14 +0200 |
---|---|---|
committer | McCabe Maxsted | 2010-10-16 17:32:57 -0700 |
commit | 17c1840637925c1165e434b502d09ee82a3d4942 (patch) | |
tree | fa16b0f14d2c881bd468e2d2f7fbe771bf35356e /linden/indra/newview/lltexturefetch.h | |
parent | Changed the display of the GCC version to add more information on the compile... (diff) | |
download | meta-impy-17c1840637925c1165e434b502d09ee82a3d4942.zip meta-impy-17c1840637925c1165e434b502d09ee82a3d4942.tar.gz meta-impy-17c1840637925c1165e434b502d09ee82a3d4942.tar.bz2 meta-impy-17c1840637925c1165e434b502d09ee82a3d4942.tar.xz |
Port of SNOW-802: Use UDP for baked textures.
Port of SNOW-802 from SG1. Originally ported by Robin cornelius from
SG 2.1.
Also added a paramter can_use_http to the LLTextureFetchWorker
constructor, to avoid messing with locks.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lltexturefetch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h index 5eca0ba..6c6bb52 100644 --- a/linden/indra/newview/lltexturefetch.h +++ b/linden/indra/newview/lltexturefetch.h | |||
@@ -60,7 +60,7 @@ public: | |||
60 | /*virtual*/ S32 update(U32 max_time_ms); | 60 | /*virtual*/ S32 update(U32 max_time_ms); |
61 | 61 | ||
62 | bool createRequest(const std::string& url, const LLUUID& id, const LLHost& host, F32 priority, | 62 | bool createRequest(const std::string& url, const LLUUID& id, const LLHost& host, F32 priority, |
63 | S32 w, S32 h, S32 c, S32 discard, bool needs_aux); | 63 | S32 w, S32 h, S32 c, S32 discard, bool needs_aux, bool use_http); |
64 | void deleteRequest(const LLUUID& id, bool cancel); | 64 | void deleteRequest(const LLUUID& id, bool cancel); |
65 | bool getRequestFinished(const LLUUID& id, S32& discard_level, | 65 | bool getRequestFinished(const LLUUID& id, S32& discard_level, |
66 | LLPointer<LLImageRaw>& raw, LLPointer<LLImageRaw>& aux); | 66 | LLPointer<LLImageRaw>& raw, LLPointer<LLImageRaw>& aux); |