summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2025-05-29 01:02:06 +0300
committerGitHub <noreply@github.com>2025-05-29 01:02:06 +0300
commit96023976f5af0b9af8e8d066d9ad4eea213f53ee (patch)
tree56b5fadba1f247fc42b6d3a3062154d61a43abac /indra/newview/llinventorypanel.cpp
parent3af711e6da9d0004ce1b565bfadee634f087b89a (diff)
parentd3bd73ab923b8010bb395505b95bcc38b661162e (diff)
Merge pull request #4181 from secondlife/marchcat/slua-editor-merge
SLua editor: Post-release merge
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index e4d1010231..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);
}
@@ -1334,6 +1334,8 @@ void LLInventoryPanel::openStartFolderOrMyInventory()
LLFolderViewFolder *fchild = dynamic_cast<LLFolderViewFolder*>(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);