From 2b40e044c4f50b7da26fbd6dc7a377efe1a483bb Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Mon, 11 Mar 2019 20:40:29 -0400 Subject: [PATCH] [VMM] Opts --- indra/newview/llfolderviewitem.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 68ce3f976..87340e1df 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -900,8 +900,9 @@ void LLFolderViewItem::draw() const S32 FOCUS_LEFT = 1; const LLFontGL* font = getLabelFontForStyle(mLabelStyle); - const BOOL in_inventory = getListener() && gInventory.isObjectDescendentOf(getListener()->getUUID(), gInventory.getRootFolderID()); - const BOOL in_library = getListener() && gInventory.isObjectDescendentOf(getListener()->getUUID(), gInventory.getLibraryRootFolderID()); + const LLUUID* id = getListener() ? &getListener()->getUUID() : nullptr; + const BOOL in_inventory = id && gInventory.isObjectDescendentOf(*id, gInventory.getRootFolderID()); + const BOOL in_library = id && !in_inventory && gInventory.isObjectDescendentOf(*id, gInventory.getLibraryRootFolderID()); //--------------------------------------------------------------------------------// // Draw open folder arrow