diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfeaturemanager.cpp | 4 |
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"; | |||
75 | 75 | ||
76 | const char GPU_TABLE_FILENAME[] = "gpu_table.txt"; | 76 | const char GPU_TABLE_FILENAME[] = "gpu_table.txt"; |
77 | 77 | ||
78 | LLFeatureManager *gFeatureManagerp = NULL; | ||
79 | |||
80 | LLFeatureInfo::LLFeatureInfo(const char *name, const BOOL available, const F32 level) : mValid(TRUE) | 78 | LLFeatureInfo::LLFeatureInfo(const char *name, const BOOL available, const F32 level) : mValid(TRUE) |
81 | { | 79 | { |
82 | mName = name; | 80 | mName = name; |
@@ -483,7 +481,7 @@ void LLFeatureManager::applyFeatures(bool skipFeatures) | |||
483 | } | 481 | } |
484 | 482 | ||
485 | // get the control setting | 483 | // get the control setting |
486 | LLControlBase* ctrl = gSavedSettings.getControl(mIt->first); | 484 | LLControlVariable* ctrl = gSavedSettings.getControl(mIt->first); |
487 | if(ctrl == NULL) | 485 | if(ctrl == NULL) |
488 | { | 486 | { |
489 | llwarns << "AHHH! Control setting " << mIt->first << " does not exist!" << llendl; | 487 | llwarns << "AHHH! Control setting " << mIt->first << " does not exist!" << llendl; |