diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-01 10:55:24 -0500 |
commit | bfd8efb05753ac9ed858476797b5d407c912d926 (patch) | |
tree | 52905cf59bcd5b67ddc186b26a23959201353a7a /indra/newview/featuretable.txt | |
parent | ed64630a67c2c216c369099532323cab2e251cab (diff) | |
parent | b778ba9b882ecb03e61b3b9bd833618ca096f5da (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/featuretable.txt')
-rw-r--r-- | indra/newview/featuretable.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 8dd4b62a37..7d3930ac99 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -43,6 +43,7 @@ RenderLocalLights 1 1 RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 +RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVBOEnable 1 1 @@ -83,6 +84,7 @@ RenderLocalLights 1 0 RenderReflectionDetail 1 0 RenderTerrainDetail 1 0 RenderTerrainLODFactor 1 1 +RenderTransparentWater 1 0 RenderTreeLODFactor 1 0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 0.5 @@ -112,6 +114,7 @@ RenderLocalLights 1 1 RenderReflectionDetail 1 0 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 1.0 +RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 @@ -140,6 +143,7 @@ RenderLocalLights 1 1 RenderReflectionDetail 1 2 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 +RenderTransparentWater 1 1 RenderTreeLODFactor 1 0.5 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 1.125 @@ -168,6 +172,7 @@ RenderLocalLights 1 1 RenderReflectionDetail 1 4 RenderTerrainDetail 1 1 RenderTerrainLODFactor 1 2.0 +RenderTransparentWater 1 1 RenderTreeLODFactor 1 1.0 RenderUseImpostors 1 1 RenderVolumeLODFactor 1 2.0 |