diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:00:41 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:00:41 +0300 |
| commit | 0fd4b3b9ae8b1e95f73b3ad2697b8782ce97794e (patch) | |
| tree | 21ff4d19977f61453923c6655d02a43a84d67fb7 /indra/newview/app_settings/settings.xml | |
| parent | 2ae6df6095242c12e31774cfe044c447b5987c6c (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
Merge branch 'master' into DRTVWR-518-ui
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 8d5a97d1cb..52dc4744f2 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> + |