7649114588
Merge branch master (DRTVWR-571) into DRTVWR-559
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
2082443220
SL-17967 - Git rid of ARB that is in core
2022-09-01 10:58:27 -07:00
3b70c9d49c
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapade
2022-08-30 10:20:15 -07:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
509cfcad31
experiments for turning on opengl core profile on mac for DRTVWR-559
2022-08-26 09:30:01 -07:00
bde0961297
Merge branch 'DRTVWR-563' of bitbucket.org:lindenlab/viewer into DRTVWR-563
2022-08-26 10:52:07 -05:00
9bee2a92d2
SL-17997 Follow up from beta breakers results.
2022-08-26 10:51:42 -05:00
c790bf7f49
SL-17005: (WIP) (Debug) Add logging and debug settings to assist in understanding Windows 8 failure modes. Most of this should be removed later
2022-08-11 11:10:25 -07:00
eac4540fc3
SL-17005: (WIP) (DEBUG) Add logging for graphics adapters
2022-08-09 15:09:14 -07:00
47ee4aff47
SL-17005: Fix crash in initDX when no factory
2022-08-09 11:51:33 -07:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
9d9c2037e1
Merge branch 'DRTVWR-564' of bitbucket.org:lindenlab/viewer into SL-17485
2022-06-13 14:03:04 -07:00
758a602f20
SL-17485 - mac getVramSize should return all vram, not just texture-specific, and use to compute getAvailableVRAMMegabytes.
2022-06-13 13:52:06 -07:00
da069765b1
SL-17005 Tweak target VRAM usage and add some log spam to help zero in on good targets.
2022-06-08 16:24:03 -05:00
ff65e23f20
SL-17515 FIXED Extreme Mouse Sensitivity for Certain Actions
2022-06-03 14:08:04 +03:00
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
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
6eaf8521ab
SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render.
2022-05-20 19:05:28 -05:00
6c6d9a10f8
SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.
2022-05-20 13:31:18 -05:00
c0aa1a1202
SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219
...
Update task branch from main project branch.
2022-05-18 14:08:24 -04:00
4dddb17dfc
SL-17219: Mark LLWindowHeadless virtual overrides 'override'.
...
Also LLSplashScreenHeadless methods. Without this Mac builds fail.
2022-05-10 12:26:44 -04:00
3604edc27e
SL-17219: LLWindowMacOSX needs getAvailableVRAMMegabytes().
...
This is just a placeholder, but without it the viewer won't even build on Mac.
2022-05-10 12:20:19 -04:00
da6f4204b7
SL-17124 make sure window thread wakes up to proces 'quit' message
2022-04-29 22:18:20 +03:00
904b16a0a7
SL-17124 switchContext and loadShaderFile crashes
...
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
026ad511ea
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
dbb044e9bb
Merge branch 'master' into DRTVWR-543-maint
2022-04-18 20:38:06 +03:00
425b071c64
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into SL-17005
2022-03-29 15:41:34 -05:00
e60024f0af
SL-17005 WIP - Use D3D/DXGI to query for available VRAM on Windows
2022-03-29 15:41:00 -05:00
e76a3b12e6
SL-17074 fix ALT-F4 handling without impacting alt-zoom
2022-03-29 11:36:28 -06:00
578087b7bd
SL-17074 Fix Alt-F4 handling bug
2022-03-24 11:21:25 -06:00
bd3ef8a0ed
SL-16845 PTT Mic doesn't close when leaving window and releasing key
2022-03-14 17:16:09 +02:00
10e9e3ca1b
SL-16985 FIXED [Mac] Key combinations for diacritical marks are not working
2022-03-11 13:41:06 +02:00
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
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
201f83472c
Merge branch 'master' into DRTVWR-543-maint
2022-02-28 21:55:28 +02:00
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
0d6aa3c0fe
SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and querying for available video memory.
2022-02-17 22:52:23 +00:00
de72b36aaa
SL-16789 FIXED [MAC] only default cursor is shown after nstalling the Viewer in a directory with a non-ASCII name
2022-02-10 18:49:49 +02:00
1e36ef2113
SL-16757 FIXED [Mac] third-person cursor doesn't return after switching away from app and back
2022-02-08 15:37:56 +02:00
8c823b75c0
SL-16606: Add profiler category WIN32
2022-01-14 11:50:22 -08:00
970b6661cd
Merge branch 'master' into DRTVWR-543-maint
2021-12-26 14:01:17 +02:00
747dbb7da2
Merge branch 'master' into DRTVWR-540-maint
2021-12-26 14:01:06 +02:00
3ac21ebbf6
SL-16454 FIXED Performance viewer login screen is black
2021-12-17 13:07:23 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
c21dad8207
SL-16467 FIXED "Keyboard layout" is not switched
2021-12-13 12:14:14 +02:00
7683477547
SL-16480 Followup -- fix for unintialized mRect/mClientRect and bad getClientRectInScreenSpace
2021-12-09 16:44:44 -06:00
9689e606f4
SL-16480 Fix for window not saving its position on exit.
2021-12-09 14:01:41 -06:00
Andrey Kleshchev