2ff9900cd9
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-03 20:57:40 +01:00
e9370893f7
Merge branch 'contribute' into DRTVWR-577-maint-S
2023-02-02 21:22:50 +02:00
a6615b3264
SL-19110 Fix coding policy
2023-01-31 19:35:10 +02:00
8518154426
SL-19110 Fix xxhash build link and properly register contribution
2023-01-31 19:17:34 +02:00
9438ef5f79
SL-19110 Fast hashing classes for use in place of the slow LLMD5, where speed matters. ( #64 )
...
This commit adds the HBXX64 and HBXX128 classes for use as a drop-in
replacement for the slow LLMD5 hashing class, where speed matters and
backward compatibility (with standard hashing algorithms) and/or
cryptographic hashing qualities are not required.
It also replaces LLMD5 with HBXX* in a few existing hot (well, ok, just
"warm" for some) paths meeting the above requirements, while paving the way for
future use cases, such as in the DRTVWR-559 and sibling branches where the slow
LLMD5 is used (e.g. to hash materials and vertex buffer cache entries), and
could be use such a (way) faster algorithm with very significant benefits and
no negative impact.
Here is the comment I added in indra/llcommon/hbxx.h:
// HBXXH* classes are to be used where speed matters and cryptographic quality
// is not required (no "one-way" guarantee, though they are likely not worst in
// this respect than MD5 which got busted and is now considered too weak). The
// xxHash code they are built upon is vectorized and about 50 times faster than
// MD5. A 64 bits hash class is also provided for when 128 bits of entropy are
// not needed. The hashes collision rate is similar to MD5's.
// See https://github.com/Cyan4973/xxHash#readme for details.
2023-01-31 18:42:51 +02:00
21b5928652
SL-19097 Crash when selecting a model for upload and waiting too long
...
Should be fixed by SL-18996, but just in case user decides to select a model while viewer closes
2023-01-28 02:02:42 +02:00
27080dc7f7
SL-18996 make MacOS picker dialogs modeless to avoid disconnects #2
2023-01-27 17:25:18 +02:00
2398a28af6
SL-18996 [WIP] MacOS make picker dialogs non-modal to avoid disconnects #1
2023-01-27 17:25:18 +02:00
e2eda8c2bd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-01-25 14:41:15 +01:00
6ae8248f5d
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.h
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/de/floater_about_land.xml
# indra/newview/skins/default/xui/de/floater_avatar_textures.xml
# indra/newview/skins/default/xui/de/floater_camera.xml
# indra/newview/skins/default/xui/de/floater_camera_presets.xml
# indra/newview/skins/default/xui/de/floater_linkreplace.xml
# indra/newview/skins/default/xui/de/floater_people.xml
# indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/de/floater_preview_trash.xml
# indra/newview/skins/default/xui/de/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/de/notifications.xml
# indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/de/panel_group_roles.xml
# indra/newview/skins/default/xui/de/panel_login.xml
# indra/newview/skins/default/xui/de/panel_notification_list_item.xml
# indra/newview/skins/default/xui/de/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/de/panel_preferences_sound.xml
# indra/newview/skins/default/xui/de/panel_progress.xml
# indra/newview/skins/default/xui/de/panel_region_environment.xml
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/de/teleport_strings.xml
# indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml
# indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml
# indra/newview/skins/default/xui/es/floater_camera.xml
# indra/newview/skins/default/xui/es/floater_god_tools.xml
# indra/newview/skins/default/xui/es/floater_people.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/es/notifications.xml
# indra/newview/skins/default/xui/es/panel_group_roles.xml
# indra/newview/skins/default/xui/es/panel_landmark_info.xml
# indra/newview/skins/default/xui/es/panel_login.xml
# indra/newview/skins/default/xui/es/panel_preferences_sound.xml
# indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/es/strings.xml
# indra/newview/skins/default/xui/es/teleport_strings.xml
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/fr/floater_camera.xml
# indra/newview/skins/default/xui/fr/floater_camera_presets.xml
# indra/newview/skins/default/xui/fr/floater_forget_user.xml
# indra/newview/skins/default/xui/fr/floater_linkreplace.xml
# indra/newview/skins/default/xui/fr/floater_people.xml
# indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/fr/floater_preview_trash.xml
# indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/fr/menu_viewer.xml
# indra/newview/skins/default/xui/fr/notifications.xml
# indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/fr/panel_group_roles.xml
# indra/newview/skins/default/xui/fr/panel_login.xml
# indra/newview/skins/default/xui/fr/panel_notification_list_item.xml
# indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
# indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/fr/panel_progress.xml
# indra/newview/skins/default/xui/fr/panel_region_environment.xml
# indra/newview/skins/default/xui/fr/strings.xml
# indra/newview/skins/default/xui/fr/teleport_strings.xml
# indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_camera.xml
# indra/newview/skins/default/xui/it/floater_camera_presets.xml
# indra/newview/skins/default/xui/it/floater_god_tools.xml
# indra/newview/skins/default/xui/it/floater_media_browser.xml
# indra/newview/skins/default/xui/it/floater_people.xml
# indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/it/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/it/floater_stats.xml
# indra/newview/skins/default/xui/it/menu_login.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/it/notifications.xml
# indra/newview/skins/default/xui/it/panel_group_roles.xml
# indra/newview/skins/default/xui/it/panel_landmark_info.xml
# indra/newview/skins/default/xui/it/panel_login.xml
# indra/newview/skins/default/xui/it/panel_notifications_channel.xml
# indra/newview/skins/default/xui/it/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/it/panel_place_profile.xml
# indra/newview/skins/default/xui/it/panel_preferences_sound.xml
# indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/it/panel_region_environment.xml
# indra/newview/skins/default/xui/it/sidepanel_appearance.xml
# indra/newview/skins/default/xui/it/strings.xml
# indra/newview/skins/default/xui/it/teleport_strings.xml
# indra/newview/skins/default/xui/ja/floater_camera.xml
# indra/newview/skins/default/xui/ja/floater_camera_presets.xml
# indra/newview/skins/default/xui/ja/floater_people.xml
# indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_group_roles.xml
# indra/newview/skins/default/xui/ja/panel_login.xml
# indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
# indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
# indra/newview/skins/default/xui/ja/panel_region_environment.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/ja/teleport_strings.xml
# indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
# indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
# indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/pl/panel_profile_pick.xml
# indra/newview/skins/default/xui/pl/panel_profile_picks.xml
# indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/pl/panel_region_access.xml
# indra/newview/skins/default/xui/pl/panel_script_experience.xml
# indra/newview/skins/default/xui/pt/notifications.xml
# indra/newview/skins/default/xui/pt/panel_group_roles.xml
# indra/newview/skins/default/xui/pt/panel_landmark_info.xml
# indra/newview/skins/default/xui/pt/panel_login.xml
# indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
# indra/newview/skins/default/xui/pt/strings.xml
2023-01-25 14:40:06 +01:00
f499f0805f
FIRE-32306: Fix the fix
2023-01-25 12:59:32 +01:00
924faa1856
[FIRE-32644]Proxy connect timeout too short
...
Timeout was randomly failing leading to intermittent behaviour with slow localhost proxies and complete failure on network proxies.
2023-01-25 09:38:51 +00:00
ba90e1b1e9
[OpenSim][FIRE-32306] profiles not loading and sundry issues
...
Thanks to Ubit for hint on the misplaced code preventing tab loading
updates to data commit for Notes section, saving should now work.
2023-01-25 09:32:42 +00:00
11b9b6f5f8
INTL-477 Translation update for Maint S
2023-01-24 15:01:53 +02:00
1109fca197
SL-19025 Fix for object's context menu
...
Inspect and copy doesn't work for face or child selection. Disable them in such cases.
2023-01-24 14:17:08 +02:00
6ffc7e64d1
[OpenSim] FixUp issues on profiles not updating
...
Profiles were not updating (fixed following suggestion from Ubit - thanks)
Added additional code to save 1st life notes back to server.
2023-01-23 17:11:15 +00:00
4665a0faa1
Minor gitignore cleanup
...
Also allows for build folders to be links on windows, which is fragile but useful when building
both OS and SL
2023-01-23 10:36:00 +00:00
c4f7fbe6a5
Add Beta channel build support
2023-01-20 22:49:07 +00:00
a94f907a17
SL-18989 Saved notifications some times stops displaying information
2023-01-21 00:04:11 +02:00
3076d01fb4
update to control build channel from branch
...
oops
2023-01-20 18:47:10 +00:00
e02e247d34
Silence stupid Mac complaining about inconsistent override keyword usage
2023-01-19 15:58:11 +01:00
34a444b0b2
Linux: Update FMOD 3p - Patch by PorkChop, thank you!
2023-01-19 12:49:14 +01:00
e60eb81d56
Linux: use system wide fontconfig instead of 3p library, if all goes well we can later remove it from autobuild.xml - patch by PorkChop, thank you!
2023-01-19 12:38:02 +01:00
50e8414428
Fix re-download from secondlife.com error messages.
2023-01-18 22:15:11 +00:00
e3a90ba4c1
SL-3033 flv files prompt download instead of playing
...
Viewer doesn't support web downloads, it should be safe to assume stream and play it
2023-01-18 22:00:01 +02:00
f8f4c43658
Update FMOD Studio to 2.02.11 for Windows
2023-01-18 19:23:04 +01:00
7421167ff2
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-01-18 15:18:10 +01:00
dceda0b4c5
FIRE-32616 Russian translation update, by Romka Swallowtail
2023-01-18 15:18:01 +01:00
4526e14388
FIRE-32520: Prevent log spam when show friends only is enabled
2023-01-18 15:00:43 +01:00
9e6494e621
FIRE-32602: Fix context menu missing in group member list
2023-01-18 14:28:04 +01:00
4d6aefde72
FIRE-32614: Fix chat console font size cannot be change on the fly anymore
2023-01-18 14:10:52 +01:00
271ba51734
Disable C6011 code analyses warning for now popping up everywhere because of the LL_ENDL / LLERROR_CRASH macro
2023-01-17 18:54:20 +01:00
8a31926cd5
Fix uninitialized variable warning
2023-01-17 18:35:00 +01:00
e90047bddd
Revert "Make VS2017 runtime optional so we can compile with VS2022 (for local" since that's not true if you setup the build correctly and those runtimes need to get packaged with the viewer
...
This reverts commit 9ff2ed7352
2023-01-17 17:45:07 +01:00
61b8870fcf
Don't try to access stuff that doesn't exist anymore
2023-01-17 17:42:26 +01:00
a0ac418814
Let's add support for VS2022, shall we?
2023-01-17 15:59:44 +01:00
8ff51bdeb2
Merge branch 'contribute' into DRTVWR-577-maint-S
2023-01-16 23:17:19 +02:00
8ec8732ec9
SL-18893 OSX buildfix
2023-01-16 23:16:43 +02:00
20b16ddf05
MacOS Build fix
2023-01-16 20:43:12 +02:00
a1931d8cc4
SL-18735 Using "Find original" in main inventory tab breaks inventory view
...
Fixes folders being invidible (missing arrange)
Fixes sroll to target not working reliably
2023-01-16 20:42:20 +02:00
484e3b6213
Merge branch 'xcode-14.1' into DRTVWR-577-maint-S
...
D577 should have picked part of the changes from contribute branch, picking up the rest for the sake of branch specific crash fixes
2023-01-16 20:07:02 +02:00
77a42cb8d6
Merge branch 'contribute' into DRTVWR-577-maint-S
2023-01-16 20:04:57 +02:00
b34d209abc
SL-18937 Add missing panel_* files in Polish translation ( #50 )
2023-01-16 20:03:58 +02:00
de77dc3ed3
MacOS Build fix
2023-01-16 19:52:35 +02:00
bea930071f
Merge branch 'contribute' into DRTVWR-577-maint-S
2023-01-16 07:05:01 +02:00
207a817dfe
We love whitespace - yes we do! (And the LLCachedControl is super pointless here...)
2023-01-14 14:07:56 +01:00
cbb0277a77
Update German translation
2023-01-14 13:23:26 +01:00
ca21f6bf1e
Sync texture fetcher with previous release
2023-01-14 13:17:32 +01:00
937992df65
FIRE-32589 French translation update, by Laurent Bechir
2023-01-14 12:25:25 +01:00
0ade3406d7
Add name attributes in panel_script_experience.xml
2023-01-13 20:00:40 +01:00
Ansariel