68b75be652
SL-9436 Don't render 100% transparent objects.
2021-10-28 22:09:22 +00:00
02bc150a7f
Merge branch 'DRTVWR-541' of https://bitbucket.org/lindenlab/viewer
2021-10-28 12:47:09 +02:00
ba3459f77f
Merged DRTVWR-546 into SL-15999
2021-10-25 15:55:06 +00:00
e5cd9cb90f
merge
2021-10-22 18:11:48 +01:00
5553d61421
SL-16203 Fix for wonky handling of mouse deltas.
2021-10-22 17:01:33 +00:00
32f46e17d3
SL-16027: Fix SL-15962 breaking Tracy OpenGL. Can now log memory + OpenGL in Tracy at the same time.
2021-10-15 16:13:06 -07:00
cf80612b7d
Fix up memory/gpu profiling
...
Note that the memory profiling is incomplete.
only c++ new/delete annd aligned allocation is intercepted. On Linux/Mac, most aligned allocation will also be ignored.
The Linux paths in llmemopry.h should probably be rewritten to use more efficient APIs as well.
2021-10-12 10:19:57 +01:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
2148e4c731
SL-16094 Move LLWindowWin32::mainWindowProc and Windows message handling to a background thread to prevent frame stalls in LLWindowWin32::gatherInput
2021-10-01 15:51:12 +00:00
851fef6801
SL-16102 Set window title to agent name (child of SL-15999 Support for low overhead, non interactive viewer sessions)
2021-09-28 15:24:42 -07:00
9cff7ebc0c
Merge remote-tracking branch 'remotes/origin/DRTVWR-541' into DRTVWR-546
...
# Conflicts:
# indra/llcommon/linden_common.h
2021-09-22 16:50:20 -05:00
a35544c701
SL-16027: Add Tracy OpenGL support
2021-09-21 16:10:52 -07:00
014dd037dd
SL-16043 Fix DisableVerticalSync, default DisableVerticalSync to off, remove broken frame limiter code (use vsync if you want to limit framerate).
2021-09-20 21:22:17 +00:00
603e04ee3c
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 13:18:55 +02:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
3a16a54452
SL-15359 out_of_range exception
2021-06-08 23:56:23 +03:00
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
c516f1fc9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:50:45 +02:00
58b4afa0ba
Merge branch 'master' into DRTVWR-530-maint
2021-04-30 03:05:06 +03:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
5cde118ec8
SL-14664 Added zoomout and sizeall
...
Remade code to use getCursorFromString
2021-04-27 23:08:54 +03:00
4f834d8224
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 21:01:07 +01:00
e4f0270887
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 11:41:48 +01:00
2da8ac774b
Avoid lock silliness
2021-02-05 20:29:21 +00:00
3ac4e2a4fc
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-02-03 09:06:02 +01:00
24e4b6867a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 15:00:04 +01:00
7458601374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 00:05:53 +01:00
f07b332ef0
Merge branch 'master' into DV525-merge-6.4.13
2021-02-01 15:59:08 -07:00
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
3b3dc83edc
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-26 09:34:58 +01:00
7b2dd98962
SL-14705: Cleanup U32 S32 cast
2021-01-25 15:55:22 -08:00
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
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
1a8800b051
SL-14347 Crash at ChoosePixelFormat
2021-01-04 16:48:46 +02:00
6c587d437d
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-02 08:17:58 +01:00
c549651028
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-12-02 08:09:26 +01:00
bb4d02446f
SL-14347 Crash at ChoosePixelFormat SEH
2020-12-01 18:22:24 +02:00
40b0af5b1c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-20 23:02:29 +01:00
a55ec70585
SL-14347 Crash at ChoosePixelFormat
2020-11-19 16:56:10 +00:00
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
1eee9a87f3
Only try destroying an existing window
2020-11-12 22:15:44 +01:00
daec926a54
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:02:25 +01:00
af2abe17cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 00:51:42 +01:00
21e2f3e974
Merge branch 'master' 6.4.12 into DRTVWR-510
2020-11-11 15:43:06 -07:00
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
af61974386
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-05 09:14:11 +01:00
b45eb585b6
SL-13733 Verify window handle
2020-10-20 22:25:23 +02:00
3ebf3b7182
SL-13733 Verify window handle
2020-10-20 18:43:51 +03:00
857c733acd
4.6 is current OpenGL specification - so start with probing that...
2020-10-18 02:21:58 +02:00
5b89548761
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-23 12:14:36 +02:00
a1c215aa20
SL-13733 Crash: Do not unassign event handler before handling WM_DESTROY
2020-09-18 22:30:39 +03:00
240757c0d0
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-20 16:52:04 +02:00
78a79267e8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-19 09:30:26 +02:00
4e94745139
Merge branch 'master' 6.4.8 into DRTVWR-510
2020-08-18 10:22:40 -06:00
cfe0ba9035
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llimprocessing.cpp
2020-08-18 19:16:03 +03:00
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
44906ac0d4
SL-13507 Viewer should log resolution of all associated displays
2020-07-17 20:28:02 +03:00
69b005b149
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-15 16:41:49 +02:00
201384690c
SL-5894 Fix llurlentry test building
2020-07-15 16:02:51 +03:00
8c66f54cfa
SL-5894 #4 Organize device storage between sessions
2020-07-15 13:55:32 +03:00
54383cac8f
SL-5894 #3 WIP enumerate devices to flaoter, let floater set device
...
temp
2020-07-15 13:55:32 +03:00
df986a402a
SL-5894 Changed joystick init to select device with apropriate manufacturer and type
2020-07-10 14:12:07 +03:00
5cb11c6214
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-01 16:00:06 +02:00
d9a03b55ff
SL-12085 Way to debug window message processing with logcontrol
2020-06-30 23:53:48 +03:00
7c55fc0401
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-17 14:22:00 +02:00
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
6f06ccc10a
SL-12085 Debug-log window position
2020-06-15 20:22:39 +03:00
3313f382bd
SL-12971: Add logging of Display Devices -- useful on dual GPU machines
2020-05-04 12:11:57 -06:00
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
d246062116
SL-12170 Somehow crash still happens inside __try block
2019-10-22 16:21:40 +03:00
e8b426d1c2
Merge viewer-neko
2019-09-11 17:34:55 +02:00
98b28e5881
SL-11910 [Win] Horizontal scroll
2019-09-10 19:49:15 +03:00
cdcdc4b3e3
Merged in lindenlab/viewer-bear
2019-08-13 21:59:37 +03:00
ef423bfb81
Merged in lindenlab/viewer-release
2019-08-13 21:54:23 +03:00
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02:00
a0bf70b41d
SL-11592 [Mac] Ability to bind extra mouse buttons for push to talk
2019-07-18 19:18:02 +03:00
ba2429163a
SL-11592 [Win] Ability to bind extra mouse buttons for push to talk
2019-07-18 18:37:45 +03:00
293d186190
Merged in lindenlab/viewer-release
2019-06-24 20:10:14 +03:00
25d83975f4
Merge Firestorm LGPL
2019-06-22 20:54:01 +02:00
13580377c4
Merged in lindenlab/viewer-release
2019-06-22 03:16:39 +03:00
e0ca19d8ab
Merge LL viewer-release 6.2.3
2019-06-20 23:14:11 +02:00
9212c1f33e
SL-11341 Skip storing the previous gamma value on Intel GPUs + more logging
2019-06-04 00:03:03 +03:00
7cef93c267
Merge Firestorm LGPL
2019-04-15 11:34:13 +02:00
19cae5d2cc
SL-10907 getWidthF32 crash in fonts
2019-04-08 18:53:47 +03:00
b0a483bea3
SL-10907 getWidthF32 crash in fonts
2019-04-08 18:53:47 +03:00
3adc5c2b50
Merge viewer-neko
2019-03-26 19:15:36 +01:00
ec9a70de94
SL-10648 Handling for Window crash on exit
2019-03-21 18:58:11 +02:00
146792d98d
Merge Firestorm LGPL
2019-02-17 11:44:08 +01:00
6308743fd2
Fix issue where gamma was being corrupted on windows with night light enabled
2019-02-08 19:26:28 -08:00
562a0d9d0a
FIRE-23498: Tray icon flash still functions randomly - hopefully more fixes
2019-01-13 17:19:43 +01:00
8a66dd570c
FIRE-23498: Tray icon flash functions randomly
2019-01-12 12:17:18 +01:00
8b6392c0aa
Merge viewer-bugsplat
2018-12-16 13:04:08 +01:00
02b9ac8d9a
SL-10153: Fix OSMessageBoxWin32() to handle non-ASCII text.
2018-12-11 20:51:51 -05:00
d93b92ec1d
Merge viewer-bear
2018-09-12 20:13:12 +02:00
94eeef729e
MAINT-9082 crash on HandleFocusLost
2018-09-04 20:19:48 +03:00
1f02cfc1de
Merge viewer-neko
2018-08-16 14:51:06 +02:00
9f16d10f6d
MAINT-5651 Crashes on close from LLWindowWin32
2018-08-14 18:32:59 +03:00
5d3ba25bf2
Merge viewer-neko
2018-06-01 20:27:39 +02:00
18bb3f6b86
MAINT-8712 Crash on close in LLWindowWin32
2018-06-01 13:51:03 +00:00
Dave Parks