5c8d7d748b
Linux: Initial work to fix broken build, restore gstreamer 1.0
2023-03-23 21:56:53 +11: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
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
7cedcf36e2
Fix OSX build
2023-02-03 21:49:01 +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
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
92656117ba
Sundry additional debugs to help trace hang on exit in windows
2022-12-17 16:39:35 +00:00
07baa83ef2
SL-18384 Fix NSException for keyboard handling
...
Affects accent keys for diacritical marks
2022-12-16 16:31:42 +02:00
67081f9728
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloater360capture.cpp
2022-12-12 22:09:54 +01:00
f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
d01f7afff2
SL-18713 fix crash in handleCompositionMessage ( #12 )
2022-11-25 18:16:31 +02:00
a6ce12ab2b
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-11-11 13:27:28 +01:00
cb10f3b149
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
2022-11-11 12:15:54 +01:00
a53ccb2379
SL-18136 fix for Japanese IME
2022-11-02 19:38:01 +02:00
67ce0e77d7
Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-Q
2022-11-02 18:50:18 +02:00
7732257ea5
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-11-02 13:05:00 +01:00
d0e07c770b
Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type.
2022-10-30 06:56:16 -04:00
971fd6f843
Fix use of deprecated CGDisplayAvailableModes with CGDisplayCopyAllDisplayModes
2022-10-29 23:18:35 -04:00
d89033420e
Fix RenderAppleUseMultGL debug setting for enabling threaded GL engine
2022-10-29 23:18:03 -04:00
83466b301a
Clean up autorelease behavior in llwindowmac and additional leaks
2022-10-28 18:53:34 -04:00
97ea17e6e9
Fix leak of copy and paste on mac
2022-10-28 18:50:38 -04:00
594fb6b084
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lllegacyatmospherics.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewertexturelist.cpp
2022-10-25 11:56:30 +02:00
242c8cb5ed
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/CMakeLists.txt
# indra/llprimitive/llmodel.cpp
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lllegacyatmospherics.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llworld.cpp
2022-10-25 11:49:36 +02:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
1ca8584322
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-22 15:48:47 +02:00
0789d9bddf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 01:41:17 +02:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
1add5d049a
Linux/SDL2: update to SDL2-24-0, thanks PorkChop - might already help with FIRE-32074
2022-10-15 16:02:21 +02:00
48282c7fea
FIRE-31976 - Linux/X11: fix pasting text being cropped to 64k bytes
2022-10-05 00:10:45 +02:00
e977975008
FIRE-32123 - Attempt to fix Right-ALT cam on non AltGr keyboards while still keeping AltGr on AltGr keyboards working
2022-10-02 15:54:26 +02:00
07c9d38526
Linux/SDL2 - FIRE-32214 - Add checkbox to Preferences/General to enable or disable IME text input, so regular keyboard input will not be affected
2022-09-26 02:02:12 +02:00
1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
c7366f4c55
SL-17238 Fix coding policy build issues
2022-09-17 19:30:31 +03:00
Pork Chop