From 046ec79d2288cbe9e65999ea9e693652036c1813 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 6 Feb 2025 18:03:21 +0200 Subject: #3505 Make inventory run less content checks --- indra/newview/llinventorypanel.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llinventorypanel.cpp') diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index e4d1010231..5066a7da7f 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -1334,6 +1334,8 @@ void LLInventoryPanel::openStartFolderOrMyInventory() LLFolderViewFolder *fchild = dynamic_cast(child); if (fchild && fchild->getViewModelItem() + // Is this right? Name might be localized, + // use FT_ROOT_INVENTORY or gInventory.getRootFolderID()? && fchild->getViewModelItem()->getName() == "My Inventory") { fchild->setOpen(true); -- cgit v1.2.3 From 0679cbdec89fbd3ec470768bdf469f6a1d326859 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Thu, 13 Feb 2025 16:10:49 +0200 Subject: viewer-private#394 Ensure correct item id is used on mac --- indra/newview/llinventorypanel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventorypanel.cpp') diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 5066a7da7f..5a067ba454 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -579,7 +579,7 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve { if (model_item && view_item && viewmodel_item) { - const LLUUID& idp = viewmodel_item->getUUID(); + const LLUUID idp = viewmodel_item->getUUID(); view_item->destroyView(); removeItemID(idp); } -- cgit v1.2.3