diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-15 07:32:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-15 07:32:14 +0800 |
| commit | 972a3c4b944bd5a313eb4ba15b455133b3cb4ebb (patch) | |
| tree | 2601642c922d2e7bdaa527ecba23fab5a94b1902 /indra/newview/app_settings | |
| parent | 22c216764f9aaefa45a82cc8666cff7d4e3f4da8 (diff) | |
| parent | 54ef82dae2005d2340ea39208f262c564642f98f (diff) | |
Merge branch 'main' into maint-b
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d132e81e20..1de263b5cc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13773,7 +13773,10 @@ <key>Comment</key> <string> OpenGL buffer mapping mode: - 0:auto, 1:normal, 2:optimised, 3:unsynchronized.</string> + 0:auto + 1:normal + 2:optimised + 3:experimental.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -13781,7 +13784,18 @@ <key>Value</key> <integer>0</integer> </map> - + <key>MPVCameraCollapsed</key> + <map> + <key>Comment</key> + <string> + Camera floater collapsed</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</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 |