diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-04 15:31:19 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-04 15:31:19 -0800 |
| commit | c9868071b113b251e03d95163118b696e28bbe98 (patch) | |
| tree | 8428d2e97f7a61b1a10e7e10494199a39969369d /indra/newview/featuretable_linux.txt | |
| parent | e833e7ad442f5b59f95c6ccfcaaf1d103d247d69 (diff) | |
| parent | e8659e0e13c65308ad2f036dc7e7ccff0e665976 (diff) | |
Merge from trunk. Conflicts manually resolved in:
U indra/llui/lluictrlfactory.cpp
U indra/newview/llinventorybridge.cpp
U indra/newview/llviewertexture.cpp
U indra/newview/llviewertexture.h
Diffstat (limited to 'indra/newview/featuretable_linux.txt')
| -rw-r--r-- | indra/newview/featuretable_linux.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt index 57d712ede7..61a8e51c50 100644 --- a/indra/newview/featuretable_linux.txt +++ b/indra/newview/featuretable_linux.txt @@ -1,4 +1,4 @@ -version 20 +version 21 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table @@ -28,6 +28,7 @@ RenderAvatarCloth 1 1 RenderAvatarLODFactor 1 1.0 RenderAvatarVP 1 1 RenderCubeMap 1 1 +RenderDelayVBUpdate 1 0 RenderFarClip 1 256 RenderFlexTimeFactor 1 1.0 RenderFogRatio 1 4.0 |