diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 04:24:35 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-12 04:24:35 +0200 |
| commit | 91fa31c065a582b9ead8a3d2f537c9b3d72474ee (patch) | |
| tree | 50a83e42321a2b611df7c8e3f72ef452f868c591 /indra/newview/llfeaturemanager.cpp | |
| parent | 2d69438ee37a2224698418c2d00b19015b70b2b5 (diff) | |
| parent | f13cc44f8999a9897c77411d1296582b7bc1f08d (diff) | |
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 8d07035b97..aa9cba0c18 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -522,7 +522,7 @@ void LLFeatureManager::cleanupFeatureTables() mMaskList.clear(); } -void LLFeatureManager::init() +void LLFeatureManager::initSingleton() { // load the tables loadFeatureTables(); |