summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
-rw-r--r--indra/newview/pipeline.cpp4
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);
}
}