diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2019-04-04 19:26:45 +0300 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2019-04-04 19:26:45 +0300 |
| commit | 110db1173f483e4b62419e7f38deb82d06196837 (patch) | |
| tree | 3d81b2ba3fe083b6d93839960dcb593f966967be /indra/newview | |
| parent | 1d994e77020597bb09c8fcc968477cee46a79aa2 (diff) | |
| parent | 5cf18cb867be567bf921f0b94a78fd822e4112ad (diff) | |
Merged lindenlab/viewer-cougar into default
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index f3b5af39e4..5e3254243a 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.1.1 +6.1.2 diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7be5c86679..e8c9909f8c 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 (LLViewerRegion::PARTITION_BRIDGE == i || hasRenderType(part->mDrawableType)) - { //pass PARTITION BRIDGE because LLDrawable can be moved to this partition + if (hasRenderType(part->mDrawableType)) + { part->cull(camera); } } |