diff options
author | Palmer <palmer@lindenlab.com> | 2009-11-09 16:27:54 -0800 |
---|---|---|
committer | Palmer <palmer@lindenlab.com> | 2009-11-09 16:27:54 -0800 |
commit | ae3003927fca8bccf61ddfe04225748d5f285501 (patch) | |
tree | e6bf0ee0bdeb7224b76523062da2d85b7f439013 | |
parent | b6de723de05ea0e2b748a697ed995efe7b466ffd (diff) | |
parent | ed43195ee059e0a1cebf24066a4c39c52bd1e827 (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 |