diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
| commit | 73f474d886d2430db3d5c8f7729f769b389730a4 (patch) | |
| tree | 5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /indra/newview/pipeline.cpp | |
| parent | 81ffd3fccac709a5903dd0d7572db50c50850347 (diff) | |
| parent | 180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff) | |
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x[-rw-r--r--] | 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 442c3ef124..16596f2574 100644..100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3320,11 +3320,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) |