diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 20:07:25 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 20:07:25 -0500 |
commit | 4c384aa4aba560ca86c1e8c520836386f2fd5599 (patch) | |
tree | e11ad1eae274e89d128810b4fdb69a40a5fbb0a3 /indra/newview/llfeaturemanager.cpp | |
parent | 476f6a099056450b2c5632dea61c9715cb955ceb (diff) | |
parent | e1da5bda78282a75ee56a30a0019ba36d4fb599d (diff) |
merge changes for MAINT-1951
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r-- | indra/newview/llfeaturemanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 36bf5a6842..24a27c5146 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -730,7 +730,9 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures) maskFeatures("High"); maskFeatures("Class5"); break; - + case 6: + maskFeatures("Ultra"); + break; default: maskFeatures("Low"); maskFeatures("Class0"); |