diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 19:41:52 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 19:41:52 +0100 |
| commit | 84343b145a260e28fc287ba93e6ef1b4755f982f (patch) | |
| tree | ba27c7c451e5e78730c5f9f8708ad09edd768c62 | |
| parent | 068c404e23ac939879293494ed9d1912c7896e24 (diff) | |
| parent | f4e7383aa51ed26197f5068f89da365e4727f06e (diff) | |
merge from viewer-public
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 9ff871370d..abcc4faf11 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4044,6 +4044,7 @@ void LLVOAvatar::addBakedTextureStats( LLViewerFetchedTexture* imagep, F32 pixel mMaxPixelArea = llmax(pixel_area, mMaxPixelArea); mMinPixelArea = llmin(pixel_area, mMinPixelArea); imagep->resetTextureStats(); + imagep->setCanUseHTTP(false) ; //turn off http fetching for baked textures. imagep->addTextureStats(pixel_area / texel_area_ratio); imagep->setBoostLevel(boost_level); } diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 086c2f702c..4fbc6bb5da 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -266,7 +266,7 @@ BOOL LLPipeline::sRenderParticleBeacons = FALSE; BOOL LLPipeline::sRenderSoundBeacons = FALSE; BOOL LLPipeline::sRenderBeacons = FALSE; BOOL LLPipeline::sRenderHighlight = TRUE; -BOOL LLPipeline::sForceOldBakedUpload = TRUE; +BOOL LLPipeline::sForceOldBakedUpload = FALSE; S32 LLPipeline::sUseOcclusion = 0; BOOL LLPipeline::sDelayVBUpdate = TRUE; BOOL LLPipeline::sAutoMaskAlphaDeferred = TRUE; |