diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-17 11:57:01 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-17 11:57:01 +0800 |
| commit | e8c39210bdb1cc1775cb37d539a00db2c817aed3 (patch) | |
| tree | 94ba8edddce15c93a5e5d93db99bbc3bad146962 /indra/newview/app_settings | |
| parent | 551224d0d0c0d8866432b3610e9c042a3f4ad6ba (diff) | |
| parent | 84908dd8001bacf88786e5630ce80c47944c400a (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0888eb8acd..d936ab2bdd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13795,7 +13795,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> @@ -13803,7 +13806,29 @@ <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> + <key>MPVNearMeRange</key> + <map> + <key>Comment</key> + <string>Search radius in the people panel</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <integer>4096</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 |