diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-08 15:24:22 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-08 15:24:22 -0400 |
| commit | bff5a4e7940d40576f52105ab9877f5a6b7d85c8 (patch) | |
| tree | 9a87e704499c62858c9f449814bb744e2a0a26ab /indra/newview/app_settings | |
| parent | 0c20beda6800149ee71a307ca4e943b5bba56908 (diff) | |
| parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) | |
Merge. Update from viewer-release after 3.7.15 release.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/filters/BlackAndWhite.xml | 14 | ||||
| -rw-r--r-- | indra/newview/app_settings/filters/Sepia.xml | 25 | ||||
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 13 |
3 files changed, 1 insertions, 51 deletions
diff --git a/indra/newview/app_settings/filters/BlackAndWhite.xml b/indra/newview/app_settings/filters/BlackAndWhite.xml index 101ed8233a..7894628d29 100644 --- a/indra/newview/app_settings/filters/BlackAndWhite.xml +++ b/indra/newview/app_settings/filters/BlackAndWhite.xml @@ -1,20 +1,6 @@ <llsd> <array> <array> - <string>linearize</string> - <real>0.01</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - <array> - <string>contrast</string> - <real>0.8</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - <array> <string>grayscale</string> </array> </array> diff --git a/indra/newview/app_settings/filters/Sepia.xml b/indra/newview/app_settings/filters/Sepia.xml index 3d577b2998..81d7caf0eb 100644 --- a/indra/newview/app_settings/filters/Sepia.xml +++ b/indra/newview/app_settings/filters/Sepia.xml @@ -1,31 +1,6 @@ <llsd> <array> <array> - <string>linearize</string> - <real>0.01</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - <array> - <string>contrast</string> - <real>0.8</real> - <real>1.0</real> - <real>1.0</real> - <real>1.0</real> - </array> - <array> - <string>stencil</string> - <string>vignette</string> - <string>fade</string> - <real>0.5</real> - <real>1.0</real> - <real>0.0</real> - <real>0.0</real> - <real>1.0</real> - <real>4.0</real> - </array> - <array> <string>sepia</string> </array> </array> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ab15a03229..baccaffb3f 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> @@ -11474,17 +11474,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> |