diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-07-03 13:46:23 +0000 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-07-03 13:46:23 +0000 |
| commit | 9fde798bd81c703f85c144b118d0bf7a3c557c33 (patch) | |
| tree | 33863648eb22bfb14c98f18a732fc6b5903c3c82 | |
| parent | c530b3d1519e0755bf8ba8a548815856291d905c (diff) | |
| parent | 27b5ee16f29e2fd3377b343362443075638e059a (diff) | |
Merged in ruslantproductengine/viewer-cougar-4cr-2 (pull request #12)
MAINT-8335 Derendering Avatar type also derenders some rezzed mesh objects
Approved-by: Simon Linden <simon@lindenlab.com>
Approved-by: Graham Madarasz <graham@lindenlab.com>
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e541c1054e..5699d47ad8 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2514,8 +2514,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl LLSpatialPartition* part = region->getSpatialPartition(i); if (part) { - if (hasRenderType(part->mDrawableType)) - { + if (LLViewerRegion::PARTITION_BRIDGE == i || hasRenderType(part->mDrawableType)) + { //pass PARTITION BRIDGE because LLDrawable can be moved to this partition part->cull(camera); } } |