diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-04-06 16:32:25 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2021-04-06 16:32:25 +0100 |
| commit | bca5bb240d21e0f1bad5c3924587d62c1c7a7b7c (patch) | |
| tree | 36baeda88c70a7ca58059b316641c32139b5d3f1 /indra/newview/llspatialpartition.cpp | |
| parent | 704aeb09d81f0fa37e343460edb1ab11ba3dbc8c (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge remote-tracking branch 'origin/master' into SL-14999
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)) { |