diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:17:37 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:17:37 -0800 |
| commit | 8164dce567d1bd59a1de3f488b01783a5ab69ed4 (patch) | |
| tree | 5e509afd404c086e32ee4ba91b48118c0e3068f5 /indra/llinventory/llinventorysettings.cpp | |
| parent | 7d1e3e08fcfbb3801edde3b6d248080055cd0a75 (diff) | |
| parent | 258c039584dd293ba7218dc522882bc0bac25e63 (diff) | |
Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette
Diffstat (limited to 'indra/llinventory/llinventorysettings.cpp')
| -rw-r--r-- | indra/llinventory/llinventorysettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llinventorysettings.cpp b/indra/llinventory/llinventorysettings.cpp index 81485b3a97..bc604097da 100644 --- a/indra/llinventory/llinventorysettings.cpp +++ b/indra/llinventory/llinventorysettings.cpp @@ -62,7 +62,7 @@ class LLSettingsDictionary : public LLSingleton<LLSettingsDictionary>, { LLSINGLETON(LLSettingsDictionary); - void initSingleton(); + void initSingleton() override; }; LLSettingsDictionary::LLSettingsDictionary() |