livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIRE-36086] Fixed crash in LLOutfitAccordionCtrlTab::handleToolTip due to null category

master
Hecklezz 2025-11-12 21:23:34 +10:00
parent bbd3ee8018
commit f5e5e14315
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/lloutfitslist.cpp
View File

@ -1780,11 +1780,18 @@ bool LLOutfitAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
// <FS:Ansariel> Make thumbnail tooltip work properly // <FS:Ansariel> Make thumbnail tooltip work properly
//if (y >= getLocalRect().getHeight() - getHeaderHeight()) //if (y >= getLocalRect().getHeight() - getHeaderHeight())
static LLCachedControl<bool> showInventoryThumbnailTooltips(gSavedSettings, "FSShowInventoryThumbnailTooltips"); static LLCachedControl<bool> showInventoryThumbnailTooltips(gSavedSettings, "FSShowInventoryThumbnailTooltips");
if (showInventoryThumbnailTooltips && y >= getLocalRect().getHeight() - getHeaderHeight() && gInventory.getCategory(mFolderID)->getThumbnailUUID().notNull()) if (showInventoryThumbnailTooltips && y >= getLocalRect().getHeight() - getHeaderHeight())
{ {
LLSD params; LLSD params;
params["inv_type"] = LLInventoryType::IT_CATEGORY; params["inv_type"] = LLInventoryType::IT_CATEGORY;
LLViewerInventoryCategory* cat = gInventory.getCategory(mFolderID); LLViewerInventoryCategory* cat = gInventory.getCategory(mFolderID);
// <FS:TJ> Make thumbnail tooltip work properly
if (!cat || cat->getThumbnailUUID().isNull())
{
return LLAccordionCtrlTab::handleToolTip(x, y, mask);
}
// </FS:TJ>
if (cat) if (cat)
{ {
params["thumbnail_id"] = cat->getThumbnailUUID(); params["thumbnail_id"] = cat->getThumbnailUUID();