diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:44:45 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:44:45 +0200 |
| commit | 4dd3d230ec7a43845f1a72dfcc7152ab04550d8e (patch) | |
| tree | 2f6f9feefa9bdd7dd6ee4595bf65ad1af038047e /indra/newview/llfeaturemanager.cpp | |
| parent | b1ceef6ea4abffdfb36844c3b8e469283edce229 (diff) | |
| parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) | |
Merged in lindenlab/viewer-release
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(); |