summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2014-09-08 14:36:08 -0700
committerdolphin <dolphin@lindenlab.com>2014-09-08 14:36:08 -0700
commit873a72fdbad8bca29cf8129b318719c1af5f8e9d (patch)
treecf4138d025faf4c697de287a4c9a441432c11e6c /indra/newview/app_settings/settings.xml
parent4e84aa4ecfe3351463ca9c54df4477528f65e41f (diff)
parenteef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff)
Merge with 3.7.15-release
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>