diff options
author | simon <none@none> | 2014-06-24 09:47:21 -0700 |
---|---|---|
committer | simon <none@none> | 2014-06-24 09:47:21 -0700 |
commit | 527f180dd74d83e478d68402626ca23341cc42e6 (patch) | |
tree | 5aef870c565ef6f919e1cff257093c9b191ef0a5 /indra/newview/app_settings/settings.xml | |
parent | 07e7fbb4ade2e05c4863ca1e40ce26304449697d (diff) | |
parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) |
Merge viewer-release and become version 3.7.11
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a2a8cf989d..3c39c021ca 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11507,6 +11507,17 @@ <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> @@ -13325,7 +13336,7 @@ <key>SocialPhotoResolution</key> <map> <key>Comment</key> - <string>Default resolution when sharing photo using the social floater</string> + <string>Default resolution when sharing photo using the social floaters</string> <key>Persist</key> <integer>1</integer> <key>Type</key> |