summaryrefslogtreecommitdiff
path: root/indra/newview/llreflectionmap.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-09-13 18:41:43 -0500
committerDave Parks <davep@lindenlab.com>2022-09-13 18:41:43 -0500
commit93389059d5490f4ed9550bc2b38d7973a4c73a18 (patch)
tree112af7702ca68f805e11d0e7be6a61f7d83ff238 /indra/newview/llreflectionmap.cpp
parent2a5219b23f5f91a2415a51324bb5c160a0139663 (diff)
parent2e268392a387d58ced0dc4bf7dfe5ff2ce25da1e (diff)
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llreflectionmap.cpp')
-rw-r--r--indra/newview/llreflectionmap.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index 2a7ab84501..d9dd1e9381 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -82,6 +82,11 @@ void LLReflectionMap::autoAdjustOrigin()
// cast a ray towards 8 corners of bounding box
// nudge origin towards center of empty space
+ if (!node)
+ {
+ return;
+ }
+
if (node->isLeaf() || node->getChildCount() > 1 || node->getData().size() > 0)
{ // use center of object bounding box for leaf nodes or nodes with multiple child nodes
mOrigin = bounds[0];