aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfeaturemanager.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:48 -0500
committerJacek Antonelli2008-08-15 23:44:48 -0500
commit9b4f54c826ffa4f94efa866068c9d6ecdfb4b424 (patch)
tree2f8ae193ab487088962e628f1ee9dee2f5901f01 /linden/indra/newview/llfeaturemanager.h
parentSecond Life viewer sources 1.13.2.12 (diff)
downloadmeta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.zip
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.gz
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.bz2
meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.xz
Second Life viewer sources 1.13.2.15
Diffstat (limited to 'linden/indra/newview/llfeaturemanager.h')
-rw-r--r--linden/indra/newview/llfeaturemanager.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/llfeaturemanager.h b/linden/indra/newview/llfeaturemanager.h
index d38e5b7..a24f06f 100644
--- a/linden/indra/newview/llfeaturemanager.h
+++ b/linden/indra/newview/llfeaturemanager.h
@@ -84,9 +84,10 @@ public:
84 void maskCurrentList(const char *name); // Mask the current feature list with the named list 84 void maskCurrentList(const char *name); // Mask the current feature list with the named list
85 85
86 BOOL loadFeatureTables(); 86 BOOL loadFeatureTables();
87 S32 getGPUClass();
88 S32 loadGPUClass();
89 87
88 S32 getGPUClass() { return mGPUClass; }
89 std::string& getGPUString() { return mGPUString; }
90
90 void cleanupFeatureTables(); 91 void cleanupFeatureTables();
91 92
92 S32 getVersion() const { return mTableVersion; } 93 S32 getVersion() const { return mTableVersion; }
@@ -102,7 +103,9 @@ public:
102 BOOL initPCIFeatureMasks(); 103 BOOL initPCIFeatureMasks();
103 104
104 void applyRecommendedFeatures(); 105 void applyRecommendedFeatures();
106
105protected: 107protected:
108 void loadGPUClass();
106 void initBaseMask(); 109 void initBaseMask();
107 110
108 std::map<LLString, LLFeatureList *> mMaskList; 111 std::map<LLString, LLFeatureList *> mMaskList;
@@ -110,6 +113,7 @@ protected:
110 S32 mTableVersion; 113 S32 mTableVersion;
111 BOOL mSafe; // Reinitialize everything to the "safe" mask 114 BOOL mSafe; // Reinitialize everything to the "safe" mask
112 S32 mGPUClass; 115 S32 mGPUClass;
116 std::string mGPUString;
113}; 117};
114 118
115extern LLFeatureManager *gFeatureManagerp; 119extern LLFeatureManager *gFeatureManagerp;