summaryrefslogtreecommitdiff
path: root/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@Callums-MacBook-Pro.local>2021-04-01 17:14:24 -0700
committerCallum Prentice <callum@Callums-MacBook-Pro.local>2021-04-01 17:14:24 -0700
commit645cf6a5d26b21cd873238c2ac8417d0b1abd37a (patch)
tree2690e7dc8a233bd000f4ffd288aafcb1007006ea /indra/newview/llspatialpartition.cpp
parent9f95e619c9802bd405db43afa3fbf6b5ad82799d (diff)
parent167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff)
Merge branch 'master' into DRTVWR-519
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r--indra/newview/llspatialpartition.cpp2
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))
{