70721bae39
DRTVWR-559 Fix for mac build.
2023-11-03 11:15:19 -05:00
65fb4e67cb
SL-19979 Fix for frame stalls on mac with shadows enabled. Also fix multihreaded GL not working on mac (thanks, Rye!)
2023-11-02 10:47:15 -05:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
e7ba1753d2
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-02-03 01:46:01 +02:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
de0317cc3f
Merge branch 'DRTVWR-568' into DRTVWR-539
2022-11-22 23:12:05 +02:00
971fd6f843
Fix use of deprecated CGDisplayAvailableModes with CGDisplayCopyAllDisplayModes
2022-10-29 23:18:35 -04:00
d89033420e
Fix RenderAppleUseMultGL debug setting for enabling threaded GL engine
2022-10-29 23:18:03 -04:00
97ea17e6e9
Fix leak of copy and paste on mac
2022-10-28 18:50:38 -04:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
0bbe44c4b9
SL-17541 simple fallback when refresh rate is unknown
2022-10-03 15:52:50 +03:00
85504f085e
Merge branch 'master' into DRTVWR-539
2022-09-21 18:36:49 +03:00
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
f08f20db5f
Merge branch 'master' into DRTVWR-568
2022-09-15 17:00:34 -07:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
65612700f3
DRTVWR-558: Eliminate many spurious set-not-used variables.
...
With Xcode 13.4, these unused variables break Release builds.
2022-08-24 14:00:16 -04:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03: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
76c8a7ff0b
SL-17541 show the message on mac
2022-06-08 03:15:59 +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
0aaf5284dc
Merge branch 'master' into DRTVWR-539
...
# 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-02 00:46:10 +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
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
fdeeb0190e
SL-16330 Allow vsync update without restart on mac
2021-11-17 17:51:50 +02:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
768b7a4d33
SL-16330 Clean up vertical sync handling, add to UI
2021-11-09 17:17:49 +02:00
e791737032
SL-14664 Fix missed pixmap init
2021-10-29 12:14:12 +03: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
58b4afa0ba
Merge branch 'master' into DRTVWR-530-maint
2021-04-30 03:05:06 +03:00
e00edbeb4a
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
2021-04-30 03:04:06 +03:00
5cde118ec8
SL-14664 Added zoomout and sizeall
...
Remade code to use getCursorFromString
2021-04-27 23:08:54 +03:00
83127d2299
SL-14720 FIXED Undo function is incorrect on German Mac keyboard
2021-01-21 19:02:18 +02:00
4d27b11a16
SL-13507 Viewer should log resolution of all associated displays
2020-07-20 17:09:04 +03:00
153c2b2446
SL-11918 [Mac] Wheel support (horizontal scroll)
2019-09-11 16:49:10 +03:00
c5bcb31d00
SL-11592 [Mac] Fixed mouse buttons ids for correct handling.
2019-07-19 13:40:17 +03:00
a0bf70b41d
SL-11592 [Mac] Ability to bind extra mouse buttons for push to talk
2019-07-18 19:18:02 +03:00
77ba332880
SL-11178 FIXED [mac] Viewer crashes if another app gets focus before viewer window is created
2019-05-16 12:14:07 +03:00
db6d4a3cb4
SL-10888 Fixed OSX mouse issues in HiDPI mode
2019-04-15 20:26:13 +03:00
5715cda6e0
Merged in lindenlab/viewer-release
2019-03-01 10:55:47 +02:00
f6bccd6f9e
- remove getDeviceScaleFactor() and replace it to getSystemUISize() according Ansariel note
2019-01-14 19:07:00 +02:00
acc86a9139
SL-9766 [Render] [Mac] Alt + left mouse click has severely impaired functions
...
SL-10019 - [Mac] [Render] Right-click context menu immediately disappears when clicking any place in the ‘Inventory’ floater
SL-9984 - [Retina] Camera frustum, do not display correctly on "WORLD MAP" window.
SL-10027 - [Mac] [Render] Add toggle for Retina support to mitigate FPS loss
Re-FIX for Retina support.
2018-11-26 18:02:44 +02:00
eaeb8605d0
SL-9774 [Render] dragging active Second Life session to second monitor zooms in making viewer unusable
2018-10-23 19:24:03 +03:00
6ce18422de
SL-9766 [Render] [Mac] Alt + left mouse click has severely impaired functions
2018-10-19 19:12:08 +03:00
289813994e
DRTVWR-474: Clean up use of LLDir::getAppRODataDir(), esp. on Mac.
...
Clearly it's not obvious to maintainers that on the Mac, getAppRODataDir()
returns the app's Resources directory: in a number of places the code starts
with the executable directory and appends "../Resources" to find that.
2018-09-13 16:20:05 -04:00
Dave Parks