diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-09 17:24:24 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-09 17:24:24 -0800 |
commit | 4be7fa99e743732942a412fac5db4770d198999d (patch) | |
tree | 89efe932d55513b7f93db3869ff12b9063a1b1d0 | |
parent | 312e7d21a4d4996460e84aca478691ac0a4828ea (diff) | |
parent | ae3003927fca8bccf61ddfe04225748d5f285501 (diff) |
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
-rw-r--r-- | indra/newview/featuretable.txt | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index d557df3d92..d20c23df80 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -245,7 +245,6 @@ RenderVBOEnable 1 0 list Intel RenderAnisotropic 1 0 RenderLightingDetail 1 0 -RenderUseImpostors 0 0 list GeForce2 RenderAnisotropic 1 0 @@ -261,51 +260,63 @@ UseOcclusion 0 0 list Intel_830M RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_845G RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_855GM RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_865G RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_900 RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_915GM RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_915G RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_945GM RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_945G RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_950 RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_965 RenderTerrainDetail 1 0 RenderVBOEnable 1 0 UseOcclusion 0 0 +RenderUseImpostors 0 0 list Intel_G33 RenderTerrainDetail 1 0 RenderVBOEnable 1 0 +RenderUseImpostors 0 0 list Intel_G45 WindLightUseAtmosShaders 0 0 |