diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-27 22:58:52 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-27 22:58:52 +0200 |
| commit | bc496f5f17a446af27b47cbe227e7e85089bab8d (patch) | |
| tree | b7c90fee48d1f48e21c5f62fe84abaca16f8bb81 /indra/newview/llfeaturemanager.h | |
| parent | 91c311dd7beb8d723a00efac8e61019eeb8af17b (diff) | |
| parent | f89c9e9b20a13acd8f6af76699259cab4c74d5db (diff) | |
Downstream merge from lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llfeaturemanager.h')
| -rw-r--r-- | indra/newview/llfeaturemanager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index f77861a1a7..42a226cd18 100644 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -100,9 +100,10 @@ class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManag LLSINGLETON(LLFeatureManager); ~LLFeatureManager() {cleanupFeatureTables();} -public: // initialize this by loading feature table and gpu table - void init(); + void initSingleton(); + +public: void maskCurrentList(const std::string& name); // Mask the current feature list with the named list |