Second Life viewer sources 1.20.2

1 files changed, 1 insertions, 3 deletions

diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index f96b2db..9f79c18 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -75,8 +75,6 @@ const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
 
 const char GPU_TABLE_FILENAME[] = "gpu_table.txt";
 
-LLFeatureManager *gFeatureManagerp = NULL;
-
 LLFeatureInfo::LLFeatureInfo(const char *name, const BOOL available, const F32 level) : mValid(TRUE)
 {
         mName = name;
@@ -483,7 +481,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures)
                 }
 
                 // get the control setting
-                LLControlBase* ctrl = gSavedSettings.getControl(mIt->first);
+                LLControlVariable* ctrl = gSavedSettings.getControl(mIt->first);
                 if(ctrl == NULL)
                 {
                         llwarns << "AHHH! Control setting " << mIt->first << " does not exist!" << llendl;