From e9ea02825fe3829674db6609e4ec5f136736ebca Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 23 Sep 2026 20:06:27 +0300 Subject: #6348 revert Received items init change --- indra/newview/llsidepanelinventory.cpp | 20 +++----------------- .../skins/default/xui/en/panel_inbox_inventory.xml | 3 ++- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index ddb60b15db..623db82939 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -313,13 +313,6 @@ void LLSidepanelInventory::observeInboxModifications(const LLUUID& inboxID) LLPanelMarketplaceInbox * inbox = getChild(MARKETPLACE_INBOX_PANEL); LLInventoryPanel* inventory_panel = inbox->setupInventoryPanel(); mInventoryPanelInbox = inventory_panel->getInventoryPanelHandle(); - - // Collapsing/expanding the inbox layout panel doesn't toggle actual view visibility, so if the - // inbox is already expanded at this point, build the views right away. - if (mInboxLayoutPanel && !mInboxLayoutPanel->isCollapsed()) - { - inventory_panel->initializeViewBuilding(); - } } void LLSidepanelInventory::enableInbox(bool enabled) @@ -380,17 +373,10 @@ void LLSidepanelInventory::onToggleInboxBtn() { mInboxLayoutPanel->setTargetDim(gSavedPerAccountSettings.getS32("InventoryInboxHeight")); if (mInboxLayoutPanel->isInVisibleChain()) - { - gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", (U32)time_corrected()); - } - - // Build the views when expanding the inbox if that hasn't happened yet. - LLInventoryPanel* inventory_panel = mInventoryPanelInbox.get(); - if (inventory_panel) - { - inventory_panel->initializeViewBuilding(); - } + { + gSavedPerAccountSettings.setU32("LastInventoryInboxActivity", (U32)time_corrected()); } +} else { gSavedPerAccountSettings.setS32("InventoryInboxHeight", mInboxLayoutPanel->getTargetDim()); diff --git a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml index eeb37eddcf..80d5bed4a5 100644 --- a/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_inbox_inventory.xml @@ -1,4 +1,5 @@ + -- cgit v1.3