diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llfeaturemanager.cpp | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 35849552b3..e1edb5059d 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -382,7 +382,7 @@ void LLFeatureManager::cleanupFeatureTables() void LLFeatureManager::initCPUFeatureMasks() { - if (gSysMemory.getPhysicalMemory() <= 256*1024*1024) + if (gSysMemory.getPhysicalMemoryClamped() <= 256*1024*1024) { maskFeatures("RAM256MB"); } @@ -474,7 +474,7 @@ extern LLOSInfo gSysOS; void LLFeatureManager::applyRecommendedFeatures() { - // see featuretable.txt + // see featuretable.txt / featuretable_linux.txt / featuretable_mac.txt llinfos << "Applying Recommended Features" << llendl; #ifndef LL_RELEASE_FOR_DOWNLOAD @@ -524,6 +524,10 @@ void LLFeatureManager::applyRecommendedFeatures() // RippleWater BOOL ripple = getRecommendedLevel("RenderRippleWater"); gSavedSettings.setBOOL("RenderRippleWater", ripple); + + // Occlusion Culling + BOOL occlusion = getRecommendedLevel("UseOcclusion"); + gSavedSettings.setBOOL("UseOcclusion", occlusion); // Vertex Shaders S32 shaders = getRecommendedLevel("VertexShaderEnable"); |