diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-09 21:05:54 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-09 21:05:54 +0800 |
| commit | 36585539dcf15af82335b9c106f41696823dc4b1 (patch) | |
| tree | e599ecd76e9f31c05efb2febebf22d0377ec7ced /indra/newview/app_settings | |
| parent | d44065eb6d90af47401e9d0b76ad560edbb4927b (diff) | |
| parent | ecdbdc8ea6fbd9a918584be1191e012af4b38af3 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7981a2d270..0888eb8acd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13518,6 +13518,17 @@ <key>Value</key> <real>0</real> </map> + <key>MaxFPS</key> + <map> + <key>Comment</key> + <string>FPS Limiter.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <real>0</real> + </map> <key>ZoomDirect</key> <map> <key>Comment</key> @@ -13777,6 +13788,23 @@ <real>12</real> </map> + + <!-- megapahit settings --> + <key>MPVBufferOptiMode</key> + <map> + <key>Comment</key> + <string> + OpenGL buffer mapping mode: + 0:auto, 1:normal, 2:optimised, 3:unsynchronized.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>0</integer> + </map> + + <!-- Settings below are for back compatibility only. They are not used in current viewer anymore. But they can't be removed to avoid influence on previous versions of the viewer in case of settings are not used or default value |