aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorthickbrick2010-10-16 16:03:31 +0200
committerthickbrick2010-10-16 16:03:31 +0200
commit0297f5d55f2ba5975ed3869f387d404638aec88f (patch)
tree3a2f0b638228ce28b2fbcd507235122d7da84d89 /linden/indra
parentPort of SNOW-802: Use UDP for baked textures. (diff)
downloadmeta-impy-0297f5d55f2ba5975ed3869f387d404638aec88f.zip
meta-impy-0297f5d55f2ba5975ed3869f387d404638aec88f.tar.gz
meta-impy-0297f5d55f2ba5975ed3869f387d404638aec88f.tar.bz2
meta-impy-0297f5d55f2ba5975ed3869f387d404638aec88f.tar.xz
More SNOW-802: disable http for bakes earlier.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerimage.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 4f23a05..671a359 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -256,6 +256,10 @@ LLViewerImage::LLViewerImage(const LLUUID& id, const LLHost& host, BOOL usemipma
256{ 256{
257 init(true); 257 init(true);
258 sImageCount++; 258 sImageCount++;
259 if (host != LLHost::invalid)
260 {
261 mCanUseHTTP = false; // this is a baked texture
262 }
259} 263}
260 264
261LLViewerImage::LLViewerImage(const std::string& url, const LLUUID& id, BOOL usemipmaps) 265LLViewerImage::LLViewerImage(const std::string& url, const LLUUID& id, BOOL usemipmaps)