diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-25 21:32:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-25 21:32:04 +0800 |
| commit | b74c8ee3fee8dd640f40250ed09f213afa72cefc (patch) | |
| tree | cdad4aa47d4c669292591154b9c3bc1851629dd6 /indra/newview | |
| parent | 0dd799f109760f00103a6c58b437aaf3148adc75 (diff) | |
| parent | ec6c988bbbc59aed218d3629bf0c13192f6b726c (diff) | |
Merge tag 'Second_Life_Release#ec6c988-2025.05' into 2025.05
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfolderviewmodelinventory.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfolderviewmodelinventory.h | 1 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.h | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_inventory_settings.xml | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index 9223c13ec1..a0621bb015 100644 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -69,7 +69,7 @@ void LLFolderViewModelInventory::sort( LLFolderViewFolder* folder ) if (!folder->areChildrenInited() || !needsSort(folder->getViewModelItem())) return; LLFolderViewModelItemInventory* sort_modelp = static_cast<LLFolderViewModelItemInventory*>(folder->getViewModelItem()); - if (sort_modelp->getUUID().isNull()) return; + if (!sort_modelp->canSortContent()) return; bool has_favorites = false; for (std::list<LLFolderViewFolder*>::iterator it = folder->getFoldersBegin(), end_it = folder->getFoldersEnd(); diff --git a/indra/newview/llfolderviewmodelinventory.h b/indra/newview/llfolderviewmodelinventory.h index 04b0b6e8f4..74645a19e0 100644 --- a/indra/newview/llfolderviewmodelinventory.h +++ b/indra/newview/llfolderviewmodelinventory.h @@ -59,6 +59,7 @@ public: virtual EInventorySortGroup getSortGroup() const = 0; virtual LLInventoryObject* getInventoryObject() const = 0; virtual void requestSort(); + virtual bool canSortContent() const { return getUUID().notNull(); } virtual void setPassedFilter(bool filtered, S32 filter_generation, std::string::size_type string_offset = std::string::npos, std::string::size_type string_size = 0); virtual bool filter( LLFolderViewFilter& filter); virtual bool filterChildItem( LLFolderViewModelItem* item, LLFolderViewFilter& filter); diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 1b80ac163c..6c3790d2ec 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -777,6 +777,7 @@ public: mInvType = type; } /*virtual*/ void buildContextMenu(LLMenuGL& menu, U32 flags); + /*virtual*/ bool canSortContent() const { return true; } }; // Bridge builder to create Inventory-Folder-View-Bridge for Recent Inventory Panel diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml index 08b7a7af05..a51e7a844a 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml @@ -279,7 +279,7 @@ font="SansSerifMedium" text_color="White" width="300"> - Pressing return on an avatar attachment + Pressing enter on an avatar attachment </text> <combo_box control_name="InventoryAddAttachmentBehavior" |