diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2026-09-23 20:06:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-23 20:06:27 +0300 |
| commit | e9ea02825fe3829674db6609e4ec5f136736ebca (patch) | |
| tree | 0dd356916704d167f6fcda907799c0b1c7056d51 /indra/newview | |
| parent | 62025f0e343e065a39667886357564be79202d42 (diff) | |
#6348 revert Received items init change
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 20 | ||||
| -rw-r--r-- | indra/newview/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<LLPanelMarketplaceInbox>(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 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> +<!-- preinitialize_views="false" will require explicitly building views elsewhere anyway, see viewer #6348 --> <inbox_inventory_panel accepts_drag_and_drop="false" name="inventory_inbox" @@ -13,7 +14,7 @@ border="false" bevel_style="none" show_item_link_overlays="true" - preinitialize_views="false" + preinitialize_views="true" > <scroll reserve_scroll_corner="false" /> </inbox_inventory_panel> |