diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-06 08:09:31 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-06 08:09:31 +0800 |
| commit | 57f91acf044a3cf2c8a0175aab10fbb7b1e90a7f (patch) | |
| tree | 805c3e55d83094fa2010ee66bcd2b6a204736f42 /indra/newview/app_settings | |
| parent | 29d68ecb229ecb19e6d0da4cf5fbd8e3bbdde2cf (diff) | |
| parent | 8662083cf4130922732aa8fba655310664b80d8b (diff) | |
Merge branch 'main' into maint-b
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 6355d02bc9..d132e81e20 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13496,6 +13496,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> @@ -13755,6 +13766,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 |