diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 14:56:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 14:56:28 -0400 |
| commit | d47a436815a43e4c55fd9fc60aa3876a9d7f815f (patch) | |
| tree | 75076370fb60ab57a169a8d3ea492a04fd87b24e /indra/newview/pipeline.cpp | |
| parent | da343188ff07bcfc86b3d72a93f327be4f2607e2 (diff) | |
| parent | 4dd245055f3417d8f8fb611a198ed5671dbce292 (diff) | |
merge changes for 3.5.2-beta5
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 49ea4830d3..42a47c694f 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3397,11 +3397,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) |