summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-04 11:13:30 -0400
committerOz Linden <oz@lindenlab.com>2011-08-04 11:13:30 -0400
commit7714f05e62056310b77640d26df7fa8d8015d14d (patch)
tree50e7afe93504aa496da2d7b6b0b3c81278722d5f
parent9963e9aaacb2372b248ddcd37a3c5195c61a458b (diff)
parent299e18e588338d19a40a4b9944e9ddd31216b0c8 (diff)
merge back disabling of watchdog
-rw-r--r--indra/newview/app_settings/settings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2cc7eb6d01..34b4fc66e5 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12640,7 +12640,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
<key>WaterGLFogDensityScale</key>
<map>