82e80b7726
Revert "Revert changes for FIRE-32453 to try out the fix from LL"
...
This reverts commit c1fbf5e3c2
2023-07-07 21:17:29 +02:00
d80a1dee15
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
2023-07-07 21:16:55 +02:00
79198eddf7
SL-19966 Reverted "SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption"
...
This reverts commit cf692c40b0
2023-07-07 20:26:05 +03:00
1d28a79ec6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfilepicker.cpp
2023-05-18 13:43:48 +02:00
4dcab10bf8
Merge branch 'main' into DRTVWR-580-maint-T
...
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
2023-05-17 17:47:45 +03:00
ccb1dfa072
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2023-05-02 20:11:20 +02:00
523662a5c8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 18:22:32 +02:00
2a6c81f1d6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 17:52:00 +02:00
ff8dcc23bf
Merge branch 'main' into DRTVWR-577-maint-S
2023-05-02 17:39:37 +03:00
504ef7e9e3
Merge branch 'main' into DRTVWR-580-maint-T
2023-05-02 17:39:29 +03:00
895ce616ea
SL-19652 Fixed 'working' cursor flicker
2023-04-25 22:49:33 +03:00
afd49409a7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/FreeType.cmake
# indra/cmake/ViewerMiscLibs.cmake
2023-03-31 16:56:37 +02:00
41d24952ff
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
2023-03-31 17:17:21 +03:00
c7fe346ff0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llimagegl.cpp
2023-03-30 13:06:36 +02:00
36fc36432d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/CMakeLists.txt
2023-03-30 12:20:59 +02:00
7b2205d8f6
Merge branch 'main' into DRTVWR-580-maint-T
2023-03-30 00:39:12 +03:00
5217e6bfb7
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
5c8d7d748b
Linux: Initial work to fix broken build, restore gstreamer 1.0
2023-03-23 21:56:53 +11:00
2c51fe5aad
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llvovolume.cpp
2023-03-22 17:35:43 +01:00
c1fbf5e3c2
Revert changes for FIRE-32453 to try out the fix from LL
2023-03-22 16:38:27 +01:00
40b731eb76
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
...
# Conflicts:
# .gitignore
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2023-03-21 10:57:56 +01:00
cf692c40b0
SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption
2023-03-20 21:08:42 +01:00
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
f2236ddf34
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-07 14:22:57 +01:00
2c03c96b3e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-07 13:23:03 +01:00
d9e2115374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-03-07 12:47:54 +01:00
000691bf2b
Linux: FIRE-32559: vsync not working after restart, also: remove weird inverted vsync logic for SDL based windows which was not even implemented correctly
2023-02-16 15:06:33 +01:00
5bbf10db62
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-14 22:03:06 +01:00
2c8130fd8d
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llviewermessage.cpp
# indra/newview/skins/default/xui/de/floater_profile.xml
# indra/newview/skins/default/xui/es/floater_profile.xml
# indra/newview/skins/default/xui/fr/floater_profile.xml
# indra/newview/skins/default/xui/it/floater_profile.xml
# indra/newview/skins/default/xui/ja/floater_profile.xml
# indra/newview/skins/default/xui/pt/floater_profile.xml
2023-02-10 10:49:36 +01:00
f1d247809b
SL-19190 Laggy behavior when turning
...
GetAsyncKeyState is luggy in some conditions and no longer needed due to fix for SL-16845 - all 'up' keys get reset when leaving window
2023-02-09 23:49:23 +02:00
7cedcf36e2
Fix OSX build
2023-02-03 21:49:01 +01:00
06ac6c615c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# doc/contributions.txt
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llviewercontrol.cpp
# indra/newview/viewer_manifest.py
2023-02-03 15:34:47 +01:00
f7f941ae5b
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.cpp
2023-02-03 13:06:40 +01:00
130ac29ea6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 12:58:42 +01:00
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
e7ba1753d2
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-02-03 01:46:01 +02:00
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
291253d932
FIRE-32105: Application icon flashes also while viewer has focus
2023-01-27 21:30:20 +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
472ecc8088
SL-18999 IME disabling should be called in window's thread
...
For some reason positioning IME window works fine, but disabling and enabling ime works from window's thread only
2023-01-19 01:45:57 +02:00
89f3bf6c13
SL-18985 Crash at std::basic_string::erase
2023-01-18 19:20:36 +02:00
63494cf5c9
SL-12456 Potential fix for NSPersistentUIFileManager crash
...
NSPersistentUIFileManager is supposed to be responsible for restoring window position and size
2023-01-12 23:37:25 +02:00
b157ab47c0
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentui.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llfloateravatarrendersettings.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/de/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_display_name.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/ru/floater_tools.xml
2023-01-12 16:56:08 +01:00
4f4c9c7473
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-01-12 12:21:57 +01:00
f9866a3543
Merge branch 'main' into DRTVWR-573-maint-R
...
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
2023-01-12 04:37:42 +02:00
0c9d4db072
[FIRE-32453][BUG-232971] Orderly shutdown of event queues
...
Terminate related queues before the windows thread to avoid loops.
Also increase timeout on queue full wait as we don't expect to see this so often now.
2023-01-03 18:50:24 +00:00
6c4ba94b25
[FIRE-32453][BUG-232971] Further edge cases for thread hangs on exit
2023-01-03 10:02:01 +00:00
cf3f577e32
SL-18384 Fix NSException for keyboard handling
...
Affects accent keys for diacritical marks
2022-12-22 23:03:19 +01:00
e1479bd185
[FIRE-32453][BUG-232971] Improve shutdown behaviour. (Ty Rick Daylight)
...
Alter close down behaviour to ensure that the main UI window remains open until the process finishes persisting data and other close down activities.
2022-12-21 02:07:58 +00:00
68c04f41ad
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/viewer_manifest.py
2022-12-19 22:59:03 +01:00
Ansariel