Merge remote-tracking branch 'secondlife/release/26.4' into 26.4

1 files changed, 13 insertions, 3 deletions

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index d27ce81e4f..5f5c8302fe 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewerlgpl$
  * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2026, Linden Research, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -897,9 +897,21 @@ public:
                        const std::string& name) :
         LLTaskInvFVBridge(panel, uuid, name) {}
 
+    LLUIImagePtr getIcon() const override;
+
     //static bool enableIfCopyable( void* userdata );
 };
 
+// virtual
+LLUIImagePtr LLTaskScriptBridge::getIcon() const
+{
+    // Pass the item's flags so the script subtype (e.g. SST_LUA) is honored
+    // and the correct icon (Inv_Script vs Inv_Script_Luau) is selected.
+    LLInventoryItem* item = findItem();
+    U32 misc_flag = item ? item->getFlags() : 0;
+    return LLInventoryIcon::getIcon(mAssetType, mInventoryType, misc_flag, false);
+}
+
 class LLTaskLSLBridge : public LLTaskScriptBridge
 {
 public:
@@ -1611,7 +1623,6 @@ void LLPanelObjectInventory::createViewsForCategory(LLInventoryObject::object_li
                     params.name = obj->getName();
                     params.root = mFolders;
                     params.listener = bridge;
-                    params.tool_tip = params.name;
                     params.font_color = item_color;
                     params.font_highlight_color = item_color;
                     view = LLUICtrlFactory::create<LLFolderViewFolder>(params);
@@ -1625,7 +1636,6 @@ void LLPanelObjectInventory::createViewsForCategory(LLInventoryObject::object_li
                     params.listener = bridge;
                     params.creation_date = bridge->getCreationDate();
                     params.rect = LLRect();
-                    params.tool_tip = params.name;
                     params.font_color = item_color;
                     params.font_highlight_color = item_color;
                     view = LLUICtrlFactory::create<LLFolderViewItem>(params);