summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2025-08-22 17:12:03 -0700
committerCallum Prentice <callum@lindenlab.com>2025-08-22 17:12:03 -0700
commite935a8aebca4ae014b5f6b438612ac5674678fe6 (patch)
tree531498d040a62c01d444fe91eb99afb091c7fff4 /indra/newview/lltoolpie.cpp
parentbebd1b208e1b342fabf59844851124a91513e83b (diff)
parentcefee59b0e5fff683a50fe61633a9c14493d7145 (diff)
Merge branch 'develop' into callum/viewer-cef-2025-08
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r--indra/newview/lltoolpie.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 0fd9faab35..0a69be528f 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -1549,7 +1549,13 @@ bool LLToolPie::shouldAllowFirstMediaInteraction(const LLPickInfo& pick, bool mo
}
// Further object detail required beyond this point
- LLPermissions* perms = LLSelectMgr::getInstance()->getHoverNode()->mPermissions;
+ LLSelectNode* hover_node = LLSelectMgr::instance().getHoverNode();
+ if (hover_node == nullptr)
+ {
+ LL_WARNS() << "No Hover node" << LL_ENDL;
+ return false;
+ }
+ LLPermissions* perms = hover_node->mPermissions;
if(perms == nullptr)
{
LL_WARNS() << "LLSelectMgr::getInstance()->getHoverNode()->mPermissions is NULL" << LL_ENDL;