admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 00:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIRE-36899] Fix crash in the Landmarks Panel accessing potentially null root folder

Browse Source
This commit is contained in:
Hecklezz
2026-08-13 01:07:27 +10:00
parent c0846c53d7
commit 414537c3c0
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/llpanellandmarks.cpp
+9 -1
View File
@@ -384,7 +384,15 @@ void LLLandmarksPanel::doActionOnCurSelectedLandmark(LLLandmarkList::loaded_call
LLFolderViewItem* LLLandmarksPanel::getCurSelectedItem() const
{
return mCurrentSelectedList ? mCurrentSelectedList->getRootFolder()->getCurSelectedItem() : NULL;
// <FS:TJ> [FIRE-36899] Fix crash when accessing a potentially null root folder
//return mCurrentSelectedList ? mCurrentSelectedList->getRootFolder()->getCurSelectedItem() : NULL;
if (!mCurrentSelectedList)
{
return nullptr;
}
auto root_folder = mCurrentSelectedList->getRootFolder();
return root_folder ? root_folder->getCurSelectedItem() : nullptr;
// </FS:TJ>
}
LLFolderViewModelItemInventory* LLLandmarksPanel::getCurSelectedViewModelItem() const