diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-05 01:05:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-05 01:05:08 +0200 |
| commit | 25251c3ba81629f3234fc94c0368cd6300732b09 (patch) | |
| tree | 03ababecc49376c0e607b3548d9beb596f79c3a7 /indra/newview/llfeaturemanager.h | |
| parent | d47c6536820d1ed6e373147678dd0fab90e80ab8 (diff) | |
| parent | b68a05e7c30930976ed1273b4c7a0fec01d2a84f (diff) | |
Merge pull request #924 from secondlife/marchcat/x-merge
Emoji -> Maint X merge
Diffstat (limited to 'indra/newview/llfeaturemanager.h')
| -rw-r--r-- | indra/newview/llfeaturemanager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index 651404d890..70c6c09e0d 100644 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -101,7 +101,7 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag ~LLFeatureManager() {cleanupFeatureTables();} // initialize this by loading feature table and gpu table - void initSingleton(); + void initSingleton() override; public: |