summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-06 23:44:09 +0000
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-06 23:44:09 +0000
commitc11c17ed7b5c614a6c8505088aa709ddd9f1f1a4 (patch)
treec700c4f1b8ce175262a7005441195d26d15243a4 /indra/llinventory
parent15ce532ccf0d1fb387b1b048a2ed7153fad83dc2 (diff)
Remove override keyword not working with LL_SINGLETON pattern.
Diffstat (limited to 'indra/llinventory')
-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 0928e35e95..8887c23a6c 100644
--- a/indra/llinventory/llinventorysettings.cpp
+++ b/indra/llinventory/llinventorysettings.cpp
@@ -66,7 +66,7 @@ class LLSettingsDictionary : public LLSingleton<LLSettingsDictionary>,
{
LLSINGLETON(LLSettingsDictionary);
- void initSingleton() override;
+ void initSingleton();
};
LLSettingsDictionary::LLSettingsDictionary()