Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py		2022-03-01 13:41:42 +02:00
..
CMakeLists.txt	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
llappdelegate-objc.h	SL-15196 Attach correct log file to Bugsplat report	2021-05-26 14:57:31 +03:00
llcursortypes.cpp	SL-14664 Added zoomout and sizeall	2021-04-27 23:08:54 +03:00
llcursortypes.h	SL-14664 Added zoomout and sizeall	2021-04-27 23:08:54 +03:00
lldragdropwin32.cpp	…
lldragdropwin32.h	…
lldxhardware.cpp	…
lldxhardware.h	…
llkeyboard.cpp	…
llkeyboard.h	…
llkeyboardheadless.cpp	…
llkeyboardheadless.h	…
llkeyboardmacosx.cpp	…
llkeyboardmacosx.h	…
llkeyboardsdl.cpp	…
llkeyboardsdl.h	…
llkeyboardwin32.cpp	…
llkeyboardwin32.h	…
llmousehandler.cpp	…
llmousehandler.h	…
llopenglview-objc.h	…
llopenglview-objc.mm	DRTVWR-546 merge in master v6.5.1	2021-11-16 11:44:55 -07:00
llpreeditor.h	…
llwindow.cpp	SL-16330 Clean up vertical sync handling, add to UI	2021-11-09 17:17:49 +02:00
llwindow.h	SL-16330 Allow vsync update without restart on mac	2021-11-17 17:51:50 +02:00
llwindowcallbacks.cpp	…
llwindowcallbacks.h	…
llwindowheadless.cpp	SL-16330 Clean up vertical sync handling, add to UI	2021-11-09 17:17:49 +02:00
llwindowheadless.h	SL-16330 Allow vsync update without restart on mac	2021-11-17 17:51:50 +02:00
llwindowmacosx-objc.h	SL-14720 FIXED Undo function is incorrect on German Mac keyboard	2021-01-21 19:02:18 +02:00
llwindowmacosx-objc.mm	…
llwindowmacosx.cpp	Merge branch 'master' (DRTVWR-557) into DRTVWR-546	2022-03-01 13:41:42 +02:00
llwindowmacosx.h	SL-16330 Allow vsync update without restart on mac	2021-11-17 17:51:50 +02:00
llwindowmesaheadless.cpp	…
llwindowmesaheadless.h	…
llwindowsdl.cpp	Merge branch 'master' into DRTVWR-530-maint	2021-06-07 21:05:04 +03:00
llwindowsdl.h	…
llwindowwin32.cpp	Merge branch 'master' (DRTVWR-557) into DRTVWR-546	2022-03-01 13:41:42 +02:00
llwindowwin32.h	Merge branch 'master' (DRTVWR-557) into DRTVWR-546	2022-03-01 13:41:42 +02:00