livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,565 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

784 Commits (d2294841b2df66f4e684b5eed1cae955cea21cf8)

Author SHA1 Message Date
Andrey Lihatskiy ff8dcc23bf Merge branch 'main' into DRTVWR-577-maint-S 2023-05-02 17:39:37 +03:00
Mnikolenko Productengine 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
Andrey Lihatskiy 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
Andrey Lihatskiy 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
Andrey Kleshchev 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
Mnikolenko Productengine 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
Andrey Lihatskiy 7a5381b39f Merge branch 'main' into DRTVWR-573-maint-R 2023-02-02 21:51:07 +02:00
Andrey Kleshchev 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
Andrey Kleshchev 89f3bf6c13 SL-18985 Crash at std::basic_string::erase 2023-01-18 19:20:36 +02:00
Andrey Kleshchev 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
Andrey Lihatskiy 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
Andrey Kleshchev 07baa83ef2 SL-18384 Fix NSException for keyboard handling 
Affects accent keys for diacritical marks
 2022-12-16 16:31:42 +02:00
Mnikolenko Productengine 553a98723b Merge branch 'main' into DRTVWR-539 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/colors.xml
 2022-12-13 08:05:03 +02:00
Callum Prentice f7838ca17c Merge branch 'main' into DRTVWR-568 2022-12-12 11:13:10 -08:00
Andrey Lihatskiy 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
Maxim Nikolenko d01f7afff2
SL-18713 fix crash in handleCompositionMessage (#12) 2022-11-25 18:16:31 +02:00
Mnikolenko Productengine de0317cc3f Merge branch 'DRTVWR-568' into DRTVWR-539 2022-11-22 23:12:05 +02:00
Mnikolenko Productengine a53ccb2379 SL-18136 fix for Japanese IME 2022-11-02 19:38:01 +02:00
Andrey Lihatskiy 67ce0e77d7 Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-Q 2022-11-02 18:50:18 +02:00
Rye Mutt 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
Rye Mutt 971fd6f843 Fix use of deprecated CGDisplayAvailableModes with CGDisplayCopyAllDisplayModes 2022-10-29 23:18:35 -04:00
Rye Mutt d89033420e Fix RenderAppleUseMultGL debug setting for enabling threaded GL engine 2022-10-29 23:18:03 -04:00
Rye Mutt 83466b301a Clean up autorelease behavior in llwindowmac and additional leaks 2022-10-28 18:53:34 -04:00
Rye Mutt 97ea17e6e9 Fix leak of copy and paste on mac 2022-10-28 18:50:38 -04:00
Callum Linden 80585d56fd Merge master into DRTVWR-568 (and fix conflicts) 2022-10-24 17:48:16 -07:00
Mnikolenko Productengine 717b34f53f Merge branch 'master' into DRTVWR-539 
# Conflicts:
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
 2022-10-21 14:42:53 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Maxim Nikolenko 0bbe44c4b9 SL-17541 simple fallback when refresh rate is unknown 2022-10-03 15:52:50 +03:00
Mnikolenko Productengine 85504f085e Merge branch 'master' into DRTVWR-539 2022-09-21 18:36:49 +03:00
Andrey Kleshchev c7366f4c55 SL-17238 Fix coding policy build issues 2022-09-17 19:30:31 +03:00
Nicky Dasmijn 0710d95f4b Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake 2022-09-16 23:15:49 +02:00
Callum Linden f08f20db5f Merge branch 'master' into DRTVWR-568 2022-09-15 17:00:34 -07:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N 
# Conflicts:
#	indra/newview/llmodelpreview.h
 2022-09-15 20:44:04 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Nat Goodspeed 65612700f3 DRTVWR-558: Eliminate many spurious set-not-used variables. 
With Xcode 13.4, these unused variables break Release builds.
 2022-08-24 14:00:16 -04:00
Andrey Kleshchev aa5c4d45aa SL-17719 Windows support for absolute mouse positioning #2 
Better touch screen handling
 2022-08-16 00:09:50 +03:00
Andrey Kleshchev ff895e96b2 SL-17719 Windows support for absolute mouse positioning 
For virtual machines and touch screens
Also raw input is not subjected to mouse speed
 2022-08-14 21:14:39 +03:00
Nicky 6fdd35d500 Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake 2022-07-21 23:36:06 +02:00
Mnikolenko Productengine b0e9840648 Merge branch 'master' into DRTVWR-539 2022-06-29 21:03:15 +03:00
Andrey Lihatskiy 2e837e5389 Merge branch 'master' into DRTVWR-548-maint-N 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llviewercontrol.cpp
 2022-06-29 20:51:08 +03:00
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03:00
Maxim Nikolenko 264ad0ce0c mac build fix 2022-06-23 15:17:49 +03:00
Maxim Nikolenko 076a895062 SL-17635 remove unused variables 2022-06-21 17:55:29 +03:00
Nicky c66f444d2b Cleanup dependency on ui libraries. 2022-06-20 23:29:57 +02:00
Mnikolenko ProductEngine 76c8a7ff0b SL-17541 show the message on mac 2022-06-08 03:15:59 +03:00
Mnikolenko Productengine ba9bff5b9b SL-17541 Show the message that user is currently at maximum FPS 2022-06-08 01:21:42 +03:00
Nicky 95d5938eef Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake 2022-06-05 14:27:28 +02:00
Mnikolenko Productengine ff65e23f20 SL-17515 FIXED Extreme Mouse Sensitivity for Certain Actions 2022-06-03 14:08:04 +03:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
 2022-05-31 01:58:09 +03:00
Andrey Kleshchev ce0286c33b SL-17474 Device context not properly released at shutdown 2022-05-30 15:02:03 +03:00