Ansariel 394c8e17d5 Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llrender/llfontfreetype.cpp # indra/llui/llfloater.cpp # indra/llui/llfloater.h # indra/llui/lltextbase.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llinventorygallery.cpp # indra/newview/llworldmapview.cpp # indra/newview/skins/default/xui/en/floater_emoji_picker.xml		2024-01-26 00:32:06 +01:00
..
CMakeLists.txt	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-03-31 18:54:16 +02:00
llappdelegate-objc.h	…
llcursortypes.cpp	…
llcursortypes.h	…
lldragdropwin32.cpp	…
lldragdropwin32.h	…
lldxhardware.cpp	…
lldxhardware.h	…
llkeyboard.cpp	Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer	2023-07-18 00:16:15 +02:00
llkeyboard.h	Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer	2023-07-18 00:16:15 +02:00
llkeyboardheadless.cpp	…
llkeyboardheadless.h	…
llkeyboardmacosx.cpp	…
llkeyboardmacosx.h	…
llkeyboardsdl.cpp	…
llkeyboardsdl.h	…
llkeyboardsdl2.cpp	…
llkeyboardsdl2.h	…
llkeyboardwin32.cpp	Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer	2023-02-10 10:49:36 +01:00
llkeyboardwin32.h	…
llmousehandler.cpp	…
llmousehandler.h	…
llopenglview-objc.h	…
llopenglview-objc.mm	Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer	2024-01-26 00:32:06 +01:00
llpreeditor.h	…
llwindow.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539	2023-04-28 00:39:47 +02:00
llwindow.h	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-07-18 10:59:02 +02:00
llwindowcallbacks.cpp	…
llwindowcallbacks.h	…
llwindowheadless.cpp	…
llwindowheadless.h	…
llwindowmacosx-objc.h	…
llwindowmacosx-objc.mm	Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer	2023-02-03 13:06:40 +01:00
llwindowmacosx.cpp	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-11-07 11:56:19 +01:00
llwindowmacosx.h	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-02-03 11:11:13 +01:00
llwindowmesaheadless.cpp	…
llwindowmesaheadless.h	…
llwindowsdl.cpp	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
llwindowsdl.h	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
llwindowsdl2.cpp	Linux: Experimentally apply Alchemy's AMD/intel GPU memory detection fix - Thanks to Rye for this code	2023-11-02 05:53:30 +01:00
llwindowsdl2.h	Linux: make it build	2023-04-16 18:19:07 +02:00
llwindowwin32.cpp	Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer	2023-12-08 00:10:01 +01:00
llwindowwin32.h	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2022-11-30 22:51:52 +01:00