diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:17:02 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-06 23:17:02 +0000 |
| commit | 15ce532ccf0d1fb387b1b048a2ed7153fad83dc2 (patch) | |
| tree | 4a78afd7409559501a709c30447745215051155c /indra/newview/llinventoryicon.h | |
| parent | 1687719a2523e1a6a9d8ebc8aeac52c530fa8fd0 (diff) | |
| parent | cbe4cac78cf48cb9144dc2f6c194585cff87a1ce (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventoryicon.h')
| -rw-r--r-- | indra/newview/llinventoryicon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h index bc09e32087..b8637c4e33 100644 --- a/indra/newview/llinventoryicon.h +++ b/indra/newview/llinventoryicon.h @@ -48,6 +48,7 @@ public: protected: static LLInventoryType::EIconName assignWearableIcon(U32 misc_flag); + static LLInventoryType::EIconName assignSettingsIcon(U32 misc_flag); }; #endif // LL_LLINVENTORYICON_H |