diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llinventoryicon.h | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llinventoryicon.h')
| -rw-r--r-- | indra/newview/llinventoryicon.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h index b8637c4e33..6ead98d7de 100644 --- a/indra/newview/llinventoryicon.h +++ b/indra/newview/llinventoryicon.h @@ -37,13 +37,13 @@ public: static const std::string& getIconName(LLAssetType::EType asset_type, LLInventoryType::EType inventory_type = LLInventoryType::IT_NONE, U32 misc_flag = 0, // different meanings depending on item type - BOOL item_is_multi = FALSE); + bool item_is_multi = false); static const std::string& getIconName(LLInventoryType::EIconName idx); static LLPointer<class LLUIImage> getIcon(LLAssetType::EType asset_type, LLInventoryType::EType inventory_type = LLInventoryType::IT_NONE, U32 misc_flag = 0, // different meanings depending on item type - BOOL item_is_multi = FALSE); + bool item_is_multi = false); static LLPointer<class LLUIImage> getIcon(LLInventoryType::EIconName idx); protected: |