summaryrefslogtreecommitdiff
path: root/indra/llinventory/llinventorysettings.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-03-02 08:55:04 +0800
committerErik Kundiman <erik@megapahit.org>2024-03-02 08:55:04 +0800
commit64a181fdde219328560eee0ff5b87f02ba36a65f (patch)
tree285437f75513ef47639ee9f3f8d47a5dc1b0ef8c /indra/llinventory/llinventorysettings.cpp
parent60592ae0d7a98e071e516fcac70c5bf1427f20be (diff)
parent1204468415dd5248bbd01d7aaede520ede3b9d36 (diff)
Merge tag '7.1.3-release'
source for viewer 7.1.3.7878383867
Diffstat (limited to 'indra/llinventory/llinventorysettings.cpp')
-rw-r--r--indra/llinventory/llinventorysettings.cpp2
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()