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
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
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
20a2019e4b
MAINT-9076 Improved support for Retina Displays
2018-09-03 17:22:15 +03:00
536a99c7ae
MAINT-8428 FIXED [OSX] The 'Eyedropper' cursor is not shown in the world
2018-03-26 17:42:57 +03:00
a4467e9ffe
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
2017-05-04 17:16:12 -04:00
398c351371
First pass at osx/macos keyboard events - simple case like google homepage is working
2017-03-03 15:32:47 -08:00
ae0b3149ba
DRTVWR-418: Fix a round of compile errors surfaced by -std=c++11.
...
These are mostly things that were in fact erroneous, but accepted by older
compilers.
This changeset has not yet been built with Visual Studio 2013 or Linux gcc,
even with -std=c++11.
This changeset has not been built *without* -std=c++11. It should be used in
conjunction with a corresponding change to LL_BUILD_DARWIN_BASE_SWITCHES in
viewer-build-variables/variables.
This is a work in progress. We do not assert that this changeset completes the
work needed to turn on -std=c++11, even on the Mac.
2017-02-23 16:49:49 -05:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
c7e2c496ab
MAINT-6294 FIXED Cursor became invisible after typing in any input field (OS X)
2016-04-07 11:28:37 +03:00
272d40a089
MAINT-6239 [Mac] Computer cursor appears attached to crosshair after using modifier keys in mouselook
2016-03-29 13:30:00 +03:00
ca1d7da571
MAINT-3171 Alt-clicking while moving mouse can move the camera significantly
2016-03-21 17:58:39 +02:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
eb484d5051
MAINT-5909: Enable unicode text input on mac and feed that directly into the viewer. Windows fixes still required.
2015-12-03 13:32:06 -08:00
c2ad041c23
Encode keyboard event for reconstruction in the plugin.
2015-11-13 16:22:34 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
5449ae73b3
MAINT-5754: Finish key modifier experiment. Still not working.
2015-11-07 12:09:08 -08:00
bd817f6f42
MAINT-5754: Basic keyboard functionality on the Mac. Still incomplete
2015-11-06 14:12:30 -08:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
90573badb4
MAINT-3585 FIXED (Crashes when attempting to upload image.)
2015-03-30 20:11:27 +03:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
dab5acd972
merge changes for 3.7.22-release
2014-12-15 12:34:18 -05:00
4c597c548f
Fix up remaining llround() -> ll_round() issues
2014-12-12 11:03:56 -08:00
6cffbfba8b
merge
2014-12-02 14:48:45 -05:00
fe5ff3e74a
merge
2014-12-01 16:21:52 -05:00
799d13269a
MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
...
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.
All changes described here.
Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h
Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h
Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp
Unused condition and variables.
indra/llmath/llsphere.cpp
Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp
Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
2014-11-03 20:05:20 +02:00
a837281a77
merge changes for STORM-2081
2014-10-23 16:07:31 -04:00
47854b6218
STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite)
2014-10-23 12:45:05 -06:00
392d63efac
Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable]
2014-10-17 15:39:48 -07:00
Howard Stearns