diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-07-06 13:22:22 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-06 13:22:22 -0700 |
commit | a1c46ac2921d8e6aee018002eee280d9c6bb4cee (patch) | |
tree | afbd1e6a8e5e64357ceb2193e505f6a217d758bd /indra/newview/featuretable_mac.txt | |
parent | 3de5be44adb91d3a7e1ff3ca8b415964a722ce49 (diff) | |
parent | dc6c35e353b991db2651d26bc76e5b3ee9921157 (diff) |
Merged from viewer-release after resolving conflicts
Diffstat (limited to 'indra/newview/featuretable_mac.txt')
-rw-r--r-- | indra/newview/featuretable_mac.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt index a561d6c87f..2095f3a81d 100644 --- a/indra/newview/featuretable_mac.txt +++ b/indra/newview/featuretable_mac.txt @@ -59,6 +59,7 @@ RenderTextureMemoryMultiple 1 0.5 Disregard128DefaultDrawDistance 1 1 Disregard96DefaultDrawDistance 1 1 SkyUseClassicClouds 1 1 +WatchdogDisabled 1 1 // // Low Graphics Settings |