summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.h
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-28 17:19:20 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-28 17:19:20 +0100
commit24a867a646a979d48cf5f4c94eae041507a09310 (patch)
tree5f963caa5c9fd69e3ef0669220cc736cf472d8a4 /indra/newview/llfeaturemanager.h
parent176b5c5a67c3bd34da787c7446d7349dc1937803 (diff)
parent7983de22074beb25a832f89aa3e7a9728baca328 (diff)
Merged from ssh://hg.lindenlab.com/dessie/viewer-private
Diffstat (limited to 'indra/newview/llfeaturemanager.h')
-rw-r--r--indra/newview/llfeaturemanager.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h
index dd218d428f..c2ecede2c5 100644
--- a/indra/newview/llfeaturemanager.h
+++ b/indra/newview/llfeaturemanager.h
@@ -48,6 +48,7 @@ typedef enum EGPUClass
GPU_CLASS_3 = 3
} EGPUClass;
+
class LLFeatureInfo
{
public:
@@ -144,8 +145,13 @@ public:
// in the skip list if true
void applyFeatures(bool skipFeatures);
+ // load the dynamic GPU/feature table from a website
+ void fetchHTTPTables();
+
protected:
void loadGPUClass();
+ BOOL parseFeatureTable(std::string filename);
+ void parseGPUTable(std::string filename);
void initBaseMask();