diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-10-18 15:38:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-10-18 15:38:33 -0400 |
| commit | 8e30a2f06dd1ce407fcb2399823efed883b317d2 (patch) | |
| tree | e5b22fb9fd2b5e99cf195d00338da57ecdade0d4 /indra/newview/llfeaturemanager.h | |
| parent | 7df153e352ce50ded382df020cc3696b8c1b9325 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
merge changes for 4.1.1-release
Diffstat (limited to 'indra/newview/llfeaturemanager.h')
| -rw-r--r-- | indra/newview/llfeaturemanager.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index 12ea691b49..c3d87cea0b 100644 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -157,7 +157,9 @@ public: // load the dynamic GPU/feature table from a website void fetchHTTPTables(); - + + LLSD getRecommendedSettingsMap(); + protected: bool loadGPUClass(); |