diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-29 21:21:12 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-29 21:21:12 +0800 |
| commit | 28f8456367d07cac4bf18dce00d86f4360fd4433 (patch) | |
| tree | b200574026ee42095241c9540c5efc424eaef209 | |
| parent | 4aedaa02ea2330a61ff8233bc8680dca0f90eab6 (diff) | |
| parent | 2c8521de6d357d74f5b256cc2f94e9951e654d83 (diff) | |
Merge branch 'main' into 2025.05
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/icons/MP_Logo.png | bin | 1410 -> 1106 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/first_login_image.jpg | bin | 398853 -> 199811 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 347407c616..7163a2ef34 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7920,11 +7920,11 @@ <key>Comment</key> <string>If available free physical memory is below this value textures get agresively scaled down</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> <string>U32</string> <key>Value</key> - <integer>512</integer> + <integer>256</integer> </map> <key>RenderLowMemMinDiscardIncrement</key> <map> diff --git a/indra/newview/skins/default/textures/icons/MP_Logo.png b/indra/newview/skins/default/textures/icons/MP_Logo.png Binary files differindex 54c47d4508..6aba54189f 100644 --- a/indra/newview/skins/default/textures/icons/MP_Logo.png +++ b/indra/newview/skins/default/textures/icons/MP_Logo.png diff --git a/indra/newview/skins/default/textures/windows/first_login_image.jpg b/indra/newview/skins/default/textures/windows/first_login_image.jpg Binary files differindex 860fed4ac7..58c417081a 100644 --- a/indra/newview/skins/default/textures/windows/first_login_image.jpg +++ b/indra/newview/skins/default/textures/windows/first_login_image.jpg |
