diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 14:02:22 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 14:02:22 -0600 |
| commit | eb6c8c937e214f58cc4da48bd4db455315de4c20 (patch) | |
| tree | 529ce1546477d9620c18095ab73e54bbd7ea8d90 /indra/newview/llspatialpartition.cpp | |
| parent | 7781e1417e5a747a501e76ee9e976226a2656b6a (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merge branch 'master' 6.4.10 into DRTVWR-510
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2cdba4d9ba..afb25778aa 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -556,7 +556,9 @@ void LLSpatialGroup::shift(const LLVector4a &offset) if (!getSpatialPartition()->mRenderByGroup && getSpatialPartition()->mPartitionType != LLViewerRegion::PARTITION_TREE && getSpatialPartition()->mPartitionType != LLViewerRegion::PARTITION_TERRAIN && - getSpatialPartition()->mPartitionType != LLViewerRegion::PARTITION_BRIDGE) + getSpatialPartition()->mPartitionType != LLViewerRegion::PARTITION_BRIDGE && + getSpatialPartition()->mPartitionType != LLViewerRegion::PARTITION_AVATAR && + getSpatialPartition()->mPartitionType != LLViewerRegion::PARTITION_CONTROL_AV) { setState(GEOM_DIRTY); gPipeline.markRebuild(this, TRUE); |