Merge tag 'Second_Life_Release#3e0bbc7-26.4' into 26.4

6 files changed, 34 insertions, 18 deletions

diff --git a/indra/cmake/BuildPackagesInfo.cmake b/indra/cmake/BuildPackagesInfo.cmake
index 659ba9d579..ee50a21e18 100644
--- a/indra/cmake/BuildPackagesInfo.cmake
+++ b/indra/cmake/BuildPackagesInfo.cmake
@@ -12,6 +12,7 @@ add_custom_command(OUTPUT packages-info.txt
   COMMENT "Generating packages-info.txt for the about box"
   MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
   DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py
+          ${CMAKE_SOURCE_DIR}/newview/luau.txt
           ${CMAKE_SOURCE_DIR}/../autobuild.xml
   COMMAND ${PYTHON_EXECUTABLE}
           ${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE} -DAUTOBUILD=${AUTOBUILD_EXECUTABLE}
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index f1e49799cb..9f55838a8a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -10,6 +10,9 @@ include(Linking)
 include(Boost)
 include(bugsplat)
 #include(BuildPackagesInfo)
+# Luau isn't an autobuild package, so stage its license separately.
+file(MAKE_DIRECTORY "${AUTOBUILD_INSTALL_DIR}/LICENSES")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/luau.txt" "${AUTOBUILD_INSTALL_DIR}/LICENSES/luau.txt" COPYONLY)
 include(BuildVersion)
 include(CMakeCopyIfDifferent)
 include(CubemapToEquirectangularJS)
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/luau.txt b/indra/newview/luau.txt
new file mode 100644
index 0000000000..45d93adef3
--- /dev/null
+++ b/indra/newview/luau.txt
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2019-2025 Roblox Corporation
+Copyright (c) 1994–2019 Lua.org, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
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>
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py
index 5d31702e76..549f1a705d 100755
--- a/scripts/packages-formatter.py
+++ b/scripts/packages-formatter.py
@@ -122,6 +122,9 @@ if any(pkgs for pkgs in list(dups.values())):
 
 print("%s %s" % (args.channel, args.version))
 print(viewer_copyright)
+# Luau is server-side and isn't listed in the viewer's autobuild packages.
+with open(os.path.join(os.path.dirname(__file__), "..", "indra", "newview", "luau.txt"), encoding="utf-8") as luau_license:
+    print("Luau " + " / ".join(line.strip() for line in luau_license if line.startswith("Copyright")))
 version = list(info['versions'].items())
 version.sort()
 for pkg, pkg_version in version: