aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorthickbrick2010-10-16 03:16:14 +0200
committerthickbrick2010-10-16 03:16:14 +0200
commitee23c250612b9b2da34472c47c740746232c6104 (patch)
treed5e01996f2b2d4d55129bf4b93f509a22f7f8762 /linden/indra/newview/llvoavatar.cpp
parentFix the fix - bad logic for failed http requests (diff)
downloadmeta-impy-ee23c250612b9b2da34472c47c740746232c6104.zip
meta-impy-ee23c250612b9b2da34472c47c740746232c6104.tar.gz
meta-impy-ee23c250612b9b2da34472c47c740746232c6104.tar.bz2
meta-impy-ee23c250612b9b2da34472c47c740746232c6104.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/llvoavatar.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d2aa3d8..7bbaf48 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -5196,6 +5196,7 @@ void LLVOAvatar::addLocalTextureStats( ETextureIndex idx, LLViewerImage* imagep,
5196 5196
5197void LLVOAvatar::addBakedTextureStats( LLViewerImage* imagep, F32 pixel_area, F32 texel_area_ratio, S32 boost_level) 5197void LLVOAvatar::addBakedTextureStats( LLViewerImage* imagep, F32 pixel_area, F32 texel_area_ratio, S32 boost_level)
5198{ 5198{
5199 imagep->setCanUseHTTP(false) ; //turn off http fetching for baked textures.
5199 mMaxPixelArea = llmax(pixel_area, mMaxPixelArea); 5200 mMaxPixelArea = llmax(pixel_area, mMaxPixelArea);
5200 mMinPixelArea = llmin(pixel_area, mMinPixelArea); 5201 mMinPixelArea = llmin(pixel_area, mMinPixelArea);
5201 imagep->addTextureStats(pixel_area / texel_area_ratio); 5202 imagep->addTextureStats(pixel_area / texel_area_ratio);