diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-08 14:32:45 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-08 14:32:45 +0300 |
| commit | 75f8563e0a4ba06c45853a97170ef8322458bd08 (patch) | |
| tree | 39ff74fee67d6ba0f0f9524d910bb3d3ae1870b8 /indra/newview/featuretable.txt | |
| parent | 04a9a19c8361eda9bf6d7d6aa014db4d15dcf715 (diff) | |
| parent | f6ac20860fb5110571802dd0a5ac76d236855ba7 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/featuretable.txt')
| -rw-r--r-- | indra/newview/featuretable.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt index 88d2257139..a2f3fa6b75 100644 --- a/indra/newview/featuretable.txt +++ b/indra/newview/featuretable.txt @@ -59,6 +59,7 @@ SkyUseClassicClouds 1 1 RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 +WatchdogDisabled 1 1 // // Low Graphics Settings @@ -169,7 +170,6 @@ RenderDeferred 1 0 RenderDeferredSSAO 1 0 RenderShadowDetail 1 0 - // // Class Unknown Hardware (unknown) // @@ -226,7 +226,7 @@ RenderDeferred 0 0 RenderDeferredSSAO 0 0 RenderShadowDetail 0 0 - +// // "Default" setups for safe, low, medium, high // list safe @@ -244,7 +244,6 @@ RenderDeferred 0 0 RenderDeferredSSAO 0 0 RenderShadowDetail 0 0 - // // CPU based feature masks // |