diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-08 11:40:36 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-08 11:40:36 -0500 |
| commit | c12a3c9f5bc085a67ef0fc2c764a9692bcab2b66 (patch) | |
| tree | bad63257eacc0d137c5ea74b153cba600867e353 /indra/llinventory/llinventorysettings.cpp | |
| parent | efdda0b93d2dbf28e7722150028476286f0ec623 (diff) | |
| parent | ee8bc528bbf97ee8cc488651fb263b07b5c1c818 (diff) | |
Merge 'release/luau-scripting' into lua-leap for Emoji release.
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() |