diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:00:20 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:00:20 +0300 |
| commit | b39ad7724f86e00057b0519c474dd0076e4d9c29 (patch) | |
| tree | acd447975174d79508c13f0d57858a58cd7b6f2d /indra/newview/app_settings/settings.xml | |
| parent | 1d458de94934d0d56cef15596d414f155db166a0 (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
Merge branch 'master' into DRTVWR-515-maint
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 927b49107a..48a89b40a5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6708,7 +6708,7 @@ <integer>600</integer> </map> <key>MigrateCacheDirectory</key> - <map> + <map> <key>Comment</key> <string>Check for old version of disk cache to migrate to current location</string> <key>Persist</key> @@ -7958,7 +7958,6 @@ <key>Value</key> <integer>13</integer> </map> - <key>PreviewAmbientColor</key> <map> <key>Comment</key> @@ -7975,8 +7974,6 @@ <real>1.0</real> </array> </map> - - <key>PreviewDiffuse0</key> <map> <key>Comment</key> @@ -16607,3 +16604,4 @@ </map> </llsd> + |