diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:49:26 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:49:26 +0300 |
| commit | b52384d9ef81ed91b52db853af349a1a8ec8bfdb (patch) | |
| tree | aa6d272de0228428d0217aa7f61fbbc84eddb5da /indra/newview/llspatialpartition.cpp | |
| parent | 19ff86fabd84ba45bbbdfd1fa5393fb9ab89dddf (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# indra/newview/lltoolpie.cpp
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 8fc2405f0a..2cb27d85bc 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -996,7 +996,7 @@ LLSpatialGroup *LLSpatialPartition::put(LLDrawable *drawablep, BOOL was_visible) } LLSpatialGroup* group = drawablep->getSpatialGroup(); - llassert(group != NULL); + //llassert(group != NULL); if (group && was_visible && group->isOcclusionState(LLSpatialGroup::QUERY_PENDING)) { |