Commit Graph

221 Commits (65ea8e1351c548b650eea4bd2ddef02b853c933d)

Author SHA1 Message Date
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
Andrey Kleshchev 3a16a54452 SL-15359 out_of_range exception 2021-06-08 23:56:23 +03:00
Andrey Lihatskiy 3c40a833ef Merge branch 'master' into DRTVWR-530-maint 2021-06-07 21:05:04 +03:00
Andrey Lihatskiy 58b4afa0ba Merge branch 'master' into DRTVWR-530-maint 2021-04-30 03:05:06 +03:00
Dave Houlton 2386125ae0 Merge master into DV525-merge-6.4.19 2021-04-29 11:40:22 -06:00
Andrey Kleshchev 5cde118ec8 SL-14664 Added zoomout and sizeall
Remade code to use getCursorFromString
2021-04-27 23:08:54 +03:00
Dave Houlton f07b332ef0 Merge branch 'master' into DV525-merge-6.4.13 2021-02-01 15:59:08 -07:00
Andrey Kleshchev 609a26b59a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
# Conflicts:
#	autobuild.xml (llca)
#	indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
#	indra/newview/llscenemonitor.cpp (SL-14422)
#	indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
Ptolemy 7b2dd98962 SL-14705: Cleanup U32 S32 cast 2021-01-25 15:55:22 -08:00
Ptolemy ef4c7c1247 SL-14705: Merge Sovereign Engineer's fix for name tags showing in front with AMD GPUs: Fix GL_INVALID_OPERATION when copying stencil to default window framebuffer on AMD graphics on windows 2021-01-25 15:52:58 -08:00
Andrey Kleshchev 1a8800b051 SL-14347 Crash at ChoosePixelFormat 2021-01-04 16:48:46 +02:00
Andrey Kleshchev bb4d02446f SL-14347 Crash at ChoosePixelFormat SEH 2020-12-01 18:22:24 +02:00
Andrey Kleshchev a55ec70585 SL-14347 Crash at ChoosePixelFormat 2020-11-19 16:56:10 +00:00
Andrey Lihatskiy 0bba892bb0 Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
2020-11-13 18:22:43 +02:00
Dave Houlton 21e2f3e974 Merge branch 'master' 6.4.12 into DRTVWR-510 2020-11-11 15:43:06 -07:00
Andrey Lihatskiy 0303dd8179 Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
#	autobuild.xml
#	indra/llui/llfolderviewmodel.h
#	indra/newview/lltexturecache.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
Andrey Kleshchev 3ebf3b7182 SL-13733 Verify window handle 2020-10-20 18:43:51 +03:00
Andrey Kleshchev a1c215aa20 SL-13733 Crash: Do not unassign event handler before handling WM_DESTROY 2020-09-18 22:30:39 +03:00
Dave Houlton 4e94745139 Merge branch 'master' 6.4.8 into DRTVWR-510 2020-08-18 10:22:40 -06:00
Andrey Lihatskiy cfe0ba9035 Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
#	indra/newview/llimprocessing.cpp
2020-08-18 19:16:03 +03:00
Andrey Lihatskiy 4b1a0e51b0 Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
#	indra/newview/llimprocessing.cpp
#	indra/newview/llviewerjoystick.cpp
#	indra/newview/llviewermenufile.cpp
2020-08-18 19:15:26 +03:00
Mnikolenko Productengine 44906ac0d4 SL-13507 Viewer should log resolution of all associated displays 2020-07-17 20:28:02 +03:00
Andrey Kleshchev 201384690c SL-5894 Fix llurlentry test building 2020-07-15 16:02:51 +03:00
Andrey Kleshchev 8c66f54cfa SL-5894 #4 Organize device storage between sessions 2020-07-15 13:55:32 +03:00
Andrey Kleshchev 54383cac8f SL-5894 #3 WIP enumerate devices to flaoter, let floater set device
temp
2020-07-15 13:55:32 +03:00
Andrey Kleshchev df986a402a SL-5894 Changed joystick init to select device with apropriate manufacturer and type 2020-07-10 14:12:07 +03:00
Andrey Kleshchev d9a03b55ff SL-12085 Way to debug window message processing with logcontrol 2020-06-30 23:53:48 +03:00
Andrey Kleshchev d202f460e2 SL-12085 Debug log for show() and PeekMessage
User's viewer freezes right after setStartupState( STATE_LOGIN_CLEANUP ) and these places are primary suspects
2020-06-17 00:08:25 +03:00
Andrey Kleshchev 6f06ccc10a SL-12085 Debug-log window position 2020-06-15 20:22:39 +03:00
Ptolemy 3313f382bd SL-12971: Add logging of Display Devices -- useful on dual GPU machines 2020-05-04 12:11:57 -06:00
andreykproductengine d246062116 SL-12170 Somehow crash still happens inside __try block 2019-10-22 16:21:40 +03:00
andreykproductengine 98b28e5881 SL-11910 [Win] Horizontal scroll 2019-09-10 19:49:15 +03:00
AndreyL ProductEngine cdcdc4b3e3 Merged in lindenlab/viewer-bear 2019-08-13 21:59:37 +03:00
AndreyL ProductEngine ef423bfb81 Merged in lindenlab/viewer-release 2019-08-13 21:54:23 +03:00
andreykproductengine a0bf70b41d SL-11592 [Mac] Ability to bind extra mouse buttons for push to talk 2019-07-18 19:18:02 +03:00
andreykproductengine ba2429163a SL-11592 [Win] Ability to bind extra mouse buttons for push to talk 2019-07-18 18:37:45 +03:00
AndreyL ProductEngine 293d186190 Merged in lindenlab/viewer-release 2019-06-24 20:10:14 +03:00
AndreyL ProductEngine 13580377c4 Merged in lindenlab/viewer-release 2019-06-22 03:16:39 +03:00
AndreyL ProductEngine 9212c1f33e SL-11341 Skip storing the previous gamma value on Intel GPUs + more logging 2019-06-04 00:03:03 +03:00
andreykproductengine 19cae5d2cc SL-10907 getWidthF32 crash in fonts 2019-04-08 18:53:47 +03:00
Drake Arconis 6308743fd2 Fix issue where gamma was being corrupted on windows with night light enabled 2019-02-08 19:26:28 -08:00
Nat Goodspeed 02b9ac8d9a SL-10153: Fix OSMessageBoxWin32() to handle non-ASCII text. 2018-12-11 20:51:51 -05:00
andreykproductengine 94eeef729e MAINT-9082 crash on HandleFocusLost 2018-09-04 20:19:48 +03:00
andreykproductengine ec9a70de94 SL-10648 Handling for Window crash on exit 2019-03-21 18:58:11 +02:00
andreykproductengine 9f16d10f6d MAINT-5651 Crashes on close from LLWindowWin32 2018-08-14 18:32:59 +03:00
Andrey Kleshchev 18bb3f6b86 MAINT-8712 Crash on close in LLWindowWin32 2018-06-01 13:51:03 +00:00
Graham Linden graham@lindenlab.com 06bce2ddd0 Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
andreykproductengine 3b73cec39e Build fix for non-dpi aware environment 2018-01-19 19:42:57 +02:00
andreykproductengine af3bf74eea MAINT-8183 Additional logging 2018-01-17 18:46:56 +02:00
AndreyL ProductEngine 57a99273ed Merged in lindenlab/viewer-release 2018-01-17 03:20:12 +02:00