[FIRE-36086] Fixed crash in LLOutfitAccordionCtrlTab::handleToolTip due to null category
parent
bbd3ee8018
commit
f5e5e14315
|
|
@ -1780,11 +1780,18 @@ bool LLOutfitAccordionCtrlTab::handleToolTip(S32 x, S32 y, MASK mask)
|
|||
// <FS:Ansariel> Make thumbnail tooltip work properly
|
||||
//if (y >= getLocalRect().getHeight() - getHeaderHeight())
|
||||
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;
|
||||
params["inv_type"] = LLInventoryType::IT_CATEGORY;
|
||||
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)
|
||||
{
|
||||
params["thumbnail_id"] = cat->getThumbnailUUID();
|
||||
|
|
|
|||
Loading…
Reference in New Issue