From 58608551e6830e6da7d9a665ab0f721e57551260 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 11 Jan 2024 22:06:08 -0500
Subject: [PATCH] Fix nullptr crash in landmark panel
---
indra/newview/llpanellandmarks.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 2d6ceee3f7e..54f1ca38043 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -657,11 +657,11 @@ bool LLLandmarksPanel::isActionEnabled(const LLSD& userdata) const
if ("collapse_all" == command_name)
{
- return has_expanded_folders(mCurrentSelectedList->getRootFolder());
+ return mCurrentSelectedList && has_expanded_folders(mCurrentSelectedList->getRootFolder());
}
else if ("expand_all" == command_name)
{
- return has_collapsed_folders(mCurrentSelectedList->getRootFolder());
+ return mCurrentSelectedList && has_collapsed_folders(mCurrentSelectedList->getRootFolder());
}
else if ("sort_by_date" == command_name)
{
--
GitLab