From f48d7f0d7b5c226837c0e0cc6d99c22d4b43810b Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 4 May 2010 17:24:13 -0600 Subject: EXT-7080: another partial FIXED: Outfit texture updates are not transmitted (in either direction) when HTTP Textures is enabled. set LLPipeline::sForceOldBakedUpload = TRUE; by default so baked texture uploading always through UDP. --- indra/newview/pipeline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 2d2fc38573..bdcd648689 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -265,7 +265,7 @@ BOOL LLPipeline::sRenderParticleBeacons = FALSE; BOOL LLPipeline::sRenderSoundBeacons = FALSE; BOOL LLPipeline::sRenderBeacons = FALSE; BOOL LLPipeline::sRenderHighlight = TRUE; -BOOL LLPipeline::sForceOldBakedUpload = FALSE; +BOOL LLPipeline::sForceOldBakedUpload = TRUE; S32 LLPipeline::sUseOcclusion = 0; BOOL LLPipeline::sDelayVBUpdate = TRUE; BOOL LLPipeline::sFastAlpha = TRUE; -- cgit v1.2.3 From 2ab6b5fd657ae0d2c59580906c35c188a697cd1f Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 5 May 2010 12:14:27 -0600 Subject: for EXT-7080: Outfit texture updates are not transmitted (in either direction) when HTTP Textures is enabled. turn on HTTP uploading cap check for baked textures and turn off HTTP downloading checking for baked textures. --- indra/newview/pipeline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index bdcd648689..2d2fc38573 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -265,7 +265,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::sFastAlpha = TRUE; -- cgit v1.2.3 From c0a78f91066dc8b5200fadf4fe81e4f2d375a112 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 13 May 2010 14:40:48 -0600 Subject: EXT-7155: FIXED: bumpmaps failed to load reviewed by davep. --- indra/newview/pipeline.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/pipeline.cpp') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 2d2fc38573..cc65b34a61 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -284,6 +284,7 @@ BOOL LLPipeline::sRenderFrameTest = FALSE; BOOL LLPipeline::sRenderAttachedLights = TRUE; BOOL LLPipeline::sRenderAttachedParticles = TRUE; BOOL LLPipeline::sRenderDeferred = FALSE; +BOOL LLPipeline::sAllowRebuildPriorityGroup = FALSE ; S32 LLPipeline::sVisibleLightCount = 0; F32 LLPipeline::sMinRenderSize = 0.f; @@ -1780,6 +1781,12 @@ void LLPipeline::updateGL() void LLPipeline::rebuildPriorityGroups() { + if(!sAllowRebuildPriorityGroup) + { + return ; + } + sAllowRebuildPriorityGroup = FALSE ; + LLTimer update_timer; LLMemType mt(LLMemType::MTYPE_PIPELINE); -- cgit v1.2.3