summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2025-08-14 11:17:35 +0300
committerGitHub <noreply@github.com>2025-08-14 11:17:35 +0300
commit6f072c2121fcb6f00ccc773d0ff4edc5cbfb013b (patch)
tree62c4967d6be428907691f133e794654b25c5d140 /indra/newview/lltoolpie.cpp
parent8145d99f80d55c4da88adb6909386bd5c25fd743 (diff)
parentd859557c1865b0636ce2a407d2e7b814fbfc1eb6 (diff)
Merge 2025.06 into develop
Merge 2025.06 into develop
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;