diff options
author | Aura Linden <aura@lindenlab.com> | 2014-09-08 14:07:39 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-09-08 14:07:39 -0700 |
commit | b33657f3a743398082d7f3ba3f389a21e4b6fd6e (patch) | |
tree | 937784761f0fbbc54df2e7af429e8fdd6e394434 /indra/newview/app_settings/settings.xml | |
parent | e44dfc0a4eb2c1dc63592f8ced7e35debbbf6238 (diff) | |
parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) |
Pulled merge from release.
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index eb5b1786d8..a72ee0409a 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> |