diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 20:45:23 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-03 20:45:23 -0400 |
| commit | 09e953a3b7ead5ff5797be80d470b657c61234ea (patch) | |
| tree | ac6db282a64611f417a42f206733f3351f440918 /indra/newview/llfeaturemanager.cpp | |
| parent | 18083bad5cd1915a92e1650bc273db6a52100c6b (diff) | |
| parent | e4996c5d8182a0ef24f0eb445db82121fe5733d7 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index d4ba230feb..ad048f6668 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -789,7 +789,7 @@ void LLFeatureManager::applyBaseMasks() maskFeatures(gpustr); // now mask cpu type ones - if (gSysMemory.getPhysicalMemoryClamped() <= U32Megabytes(256)) + if (gSysMemory.getPhysicalMemoryKB() <= U32Megabytes(256)) { maskFeatures("RAM256MB"); } |