summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-08-06 15:34:08 -0400
committerOz Linden <oz@lindenlab.com>2014-08-06 15:34:08 -0400
commit129c2db2d258e3618dcff557c89e083e449d74d4 (patch)
tree6040ec31e3f8e96be49b43481d83e99d2b9cdc35 /indra/newview/app_settings/settings.xml
parent41eb8eabc902788f9c9aece586555adcd43bde5b (diff)
parent3dbbc49b4f535ee409c3a7c15b617c2997e80d8c (diff)
merge changes for STORM-2040
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-xindra/newview/app_settings/settings.xml13
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 000362ebfd..cab7af8a32 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -80,7 +80,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
<key>AgentPause</key>
<map>
@@ -11452,17 +11452,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>SnapshotFiltersEnabled</key>
- <map>
- <key>Comment</key>
- <string>Enable filters in the Snapshot Advanced panel (experimental).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>SnapshotFormat</key>
<map>
<key>Comment</key>