diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 21:59:52 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 21:59:52 +0300 |
| commit | 14bf268fbb7464f9822847f922de321f422cf82a (patch) | |
| tree | 8c98d63b2e3c4c231236b7253144a2fbceb3fddd /indra/newview/app_settings/settings.xml | |
| parent | 8a64ded50f3d168d5ffc9df49c41a572c3439b43 (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
Merge branch 'master' into DRTVWR-513-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 62c73c0e45..c6cc93a8c3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6719,7 +6719,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> @@ -7969,7 +7969,6 @@ <key>Value</key> <integer>13</integer> </map> - <key>PreviewAmbientColor</key> <map> <key>Comment</key> @@ -7986,8 +7985,6 @@ <real>1.0</real> </array> </map> - - <key>PreviewDiffuse0</key> <map> <key>Comment</key> @@ -16618,3 +16615,4 @@ </map> </llsd> + |