summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-05-14 09:17:25 -0700
committersimon <none@none>2013-05-14 09:17:25 -0700
commit2722ed29c97e81447d88aea127abe0341683da44 (patch)
tree382f74cbf7965f42ff0e0e2b795753d87e107fd2 /indra/newview/pipeline.cpp
parent8895e795763d14c3dae495b3648da3d4a52ba30a (diff)
parent4dd245055f3417d8f8fb611a198ed5671dbce292 (diff)
Merge in latest viewer-beta
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 340291159c..e125810ce5 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3309,11 +3309,6 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
{
drawablep->setVisible(camera, NULL, FALSE);
}
- else if (drawablep->isState(LLDrawable::CLEAR_INVISIBLE))
- {
- // clear invisible flag here to avoid single frame glitch
- drawablep->clearState(LLDrawable::FORCE_INVISIBLE|LLDrawable::CLEAR_INVISIBLE);
- }
}
if (LLViewerCamera::sCurCameraID == LLViewerCamera::CAMERA_WORLD)