aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/pipeline.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index d3ee8b6..e36e296 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -1272,6 +1272,7 @@ F32 LLPipeline::calcPixelArea(LLVector3 center, LLVector3 size, LLCamera &camera
1272 F32 dist = lookAt.length(); 1272 F32 dist = lookAt.length();
1273 1273
1274 //ramp down distance for nearby objects 1274 //ramp down distance for nearby objects
1275 //shrink dist by dist/16.
1275 if (dist < 16.f) 1276 if (dist < 16.f)
1276 { 1277 {
1277 dist /= 16.f; 1278 dist /= 16.f;
@@ -2540,8 +2541,8 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
2540 //to guaranttee at least updating one VBO buffer every frame 2541 //to guaranttee at least updating one VBO buffer every frame
2541 //to walk around the bug caused by ATI card --> DEV-3855 2542 //to walk around the bug caused by ATI card --> DEV-3855
2542 // 2543 //
2543 if(forceVBOUpdate) 2544 //if(forceVBOUpdate)
2544 gSky.mVOSkyp->updateDummyVertexBuffer() ; 2545 // gSky.mVOSkyp->updateDummyVertexBuffer() ;
2545 2546
2546 gFrameStats.start(LLFrameStats::RENDER_GEOM); 2547 gFrameStats.start(LLFrameStats::RENDER_GEOM);
2547 2548
@@ -4202,11 +4203,6 @@ void LLPipeline::enableLightsAvatar()
4202 4203
4203void LLPipeline::enableLightsAvatarEdit(const LLColor4& color) 4204void LLPipeline::enableLightsAvatarEdit(const LLColor4& color)
4204{ 4205{
4205 if (mLightingDetail < 1)
4206 {
4207 return;
4208 }
4209
4210 U32 mask = 0x2002; // Avatar backlight only, set ambient 4206 U32 mask = 0x2002; // Avatar backlight only, set ambient
4211 setupAvatarLights(TRUE); 4207 setupAvatarLights(TRUE);
4212 enableLights(mask); 4208 enableLights(mask);