diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-11 12:32:53 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-11 12:32:53 -0700 |
| commit | c16110595bdec2a666c4a5d92cb43430c3233c95 (patch) | |
| tree | fb93626ce357e7ddefed61ceeaf822a9e212b83f /indra/newview/featuretable.txt | |
| parent | ef021ddc9af1829a519edd5e6b7127be3afd57bc (diff) | |
| parent | 8511dbca1f2d10fbf7fc0d2aab7d28515520dd95 (diff) | |
automated merge and fix build break on snow leopard (it's a warning on leopard on parabuild)
Diffstat (limited to 'indra/newview/featuretable.txt')
| -rw-r--r-- | indra/newview/featuretable.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 4029bf95a0..5f31ccbb19 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -296,28 +296,23 @@ 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 |