summaryrefslogtreecommitdiff
path: root/indra/newview/featuretable_solaris.txt
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-07-06 13:22:22 -0700
committerDessie Linden <dessie@lindenlab.com>2010-07-06 13:22:22 -0700
commita1c46ac2921d8e6aee018002eee280d9c6bb4cee (patch)
treeafbd1e6a8e5e64357ceb2193e505f6a217d758bd /indra/newview/featuretable_solaris.txt
parent3de5be44adb91d3a7e1ff3ca8b415964a722ce49 (diff)
parentdc6c35e353b991db2651d26bc76e5b3ee9921157 (diff)
Merged from viewer-release after resolving conflicts
Diffstat (limited to 'indra/newview/featuretable_solaris.txt')
-rw-r--r--indra/newview/featuretable_solaris.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/featuretable_solaris.txt b/indra/newview/featuretable_solaris.txt
index 6edd280686..0ae463332c 100644
--- a/indra/newview/featuretable_solaris.txt
+++ b/indra/newview/featuretable_solaris.txt
@@ -37,6 +37,8 @@ VertexShaderEnable 1 1
RenderTextureMemoryMultiple 1 1.0
UseOcclusion 1 1
RenderCubeMap 1 1
+WatchdogDisabled 1 1
+
//
// Class 0 Hardware (Unknown or just old)