diff options
author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-06-01 01:18:47 +0300 |
---|---|---|
committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-06-01 01:18:47 +0300 |
commit | 9437d1511e2c4b73a58abc823b1ca2a29a8a4d04 (patch) | |
tree | e6b24dafcbf54d6145a44784ed4defdbbd3335c8 /indra/newview/app_settings/settings.xml | |
parent | fadb6c7c65f4d531f513d5d896ca25b9bb22b48f (diff) | |
parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) |
merge from viewer-release
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 379c05a66c..f0782e0bf7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4646,6 +4646,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>IgnoreFOVZoomForLODs</key> + <map> + <key>Comment</key> + <string>Ignore zoom effect(CTRL+0) when calculating lods.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>IgnoreAllNotifications</key> <map> <key>Comment</key> @@ -10170,9 +10181,9 @@ <key>RenderAutoMuteByteLimit</key> <map> <key>Comment</key> - <string>OBSOLETE and UNUSED.</string> + <string>If avatar attachment size exceed this value (in bytes) attachment will not be rendered. Excludes attachments worn by own avatar.</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> <string>U32</string> <key>Value</key> |