diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llfeaturemanager.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llfeaturemanager.h')
| -rw-r--r-- | indra/newview/llfeaturemanager.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index 3d05bbe2e0..927f4ada45 100644 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -1,6 +1,6 @@ /** * @file llfeaturemanager.h - * @brief LLFeatureManager class definition + * @brief The feature manager is responsible for determining what features are turned on/off in the app. * * $LicenseInfo:firstyear=2003&license=viewergpl$ * @@ -94,7 +94,7 @@ protected: }; -class LLFeatureManager : public LLFeatureList +class LLFeatureManager : public LLFeatureList, public LLSingleton<LLFeatureManager> { public: LLFeatureManager() : mInited(FALSE), mTableVersion(0), mSafe(FALSE), mGPUClass(GPU_CLASS_UNKNOWN) {} @@ -148,6 +148,5 @@ protected: BOOL mGPUSupported; }; -extern LLFeatureManager *gFeatureManagerp; #endif // LL_LLFEATUREMANAGER_H |