80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
a1090f5f5d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# 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/lldrawpoolalpha.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/quickprefs.cpp
2022-10-24 19:54:30 +02: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
66bde72599
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 13:51:00 +02: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
0e325eab28
Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/Python.cmake
# indra/llcommon/llsd.h
# indra/llcommon/llstl.h
# indra/llinventory/llparcel.cpp
# indra/llmessage/llmessagethrottle.cpp
# indra/llui/lldockablefloater.h
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llwatchdog.cpp
# indra/newview/viewer_manifest.py
2022-09-17 14:37:33 +02: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
e8f4153fc2
Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
2022-06-30 18:59:34 +02:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03:00
8ac67e5476
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
2022-06-18 15:53:35 +02: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
bebd6c5e13
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/llappviewer.cpp
# 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 10:12:32 +01:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# 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 10:12:19 +01: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
f0352ff093
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:49:24 +01:00
8f85cbf04c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-02-16 09:00:13 +01:00
df0cf8cd44
SL-16757 FIXED [Mac] third-person cursor doesn't return after switching away from app and back
2022-02-14 00:25:13 +01: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
d881fa40d3
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-20 22:35:31 +01:00
fdeeb0190e
SL-16330 Allow vsync update without restart on mac
2021-11-17 17:51:50 +02:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
ef7f27b0d5
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-11-16 16:30:20 +01:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01: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
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
7f91fa0b40
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:15:10 +02: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
2278b60bd3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 20:04:53 +01:00
e4f0270887
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 11:41:48 +01:00
765b6e0935
Use multithreaded OpenGL on macOS.
2021-02-13 11:03:27 -06:00
ff1fcfc1dc
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-02-03 23:54:18 +01:00
83127d2299
SL-14720 FIXED Undo function is incorrect on German Mac keyboard
2021-01-21 19:02:18 +02:00
240757c0d0
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-20 16:52:04 +02:00
4d27b11a16
SL-13507 Viewer should log resolution of all associated displays
2020-07-20 17:09:04 +03:00
e0004e744e
Merge Firestorm LGPL
2019-10-09 22:09:22 +02:00
3dadd1a95b
Changed phoenixviewer.com to firestormviewer.org in few applicable places
...
Obviously, search & replace (for XML files), plus some manual reviewing
2019-10-07 09:54:33 +02:00
e8b426d1c2
Merge viewer-neko
2019-09-11 17:34:55 +02:00
153c2b2446
SL-11918 [Mac] Wheel support (horizontal scroll)
2019-09-11 16:49:10 +03:00
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02: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
91879797f5
SL-11178 FIXED [mac] Viewer crashes if another app gets focus before viewer window is created
2019-05-16 12:14:07 +03:00
1d2ead44f6
Merge viewer-bear
2019-04-17 09:29:04 +02:00
db6d4a3cb4
SL-10888 Fixed OSX mouse issues in HiDPI mode
2019-04-15 20:26:13 +03:00
fff9fdf9ba
Merge Firestorm LGPL
2019-03-02 01:40:58 +01:00
5715cda6e0
Merged in lindenlab/viewer-release
2019-03-01 10:55:47 +02:00
445b66a93e
Merge viewer-cougar
2019-02-07 23:45:34 +01:00
f6bccd6f9e
- remove getDeviceScaleFactor() and replace it to getSystemUISize() according Ansariel note
2019-01-14 19:07:00 +02:00
b4d4aac1c2
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
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
fcb454cbd7
Merge viewer-cougar
2018-11-14 19:44:40 +01:00
ee34ea1f4b
Merge viewer-bugsplat
2018-10-27 00:50:58 +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
a226bbd055
Merge viewer-cougar
2018-09-25 17:57:19 +02: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
9203b70ca3
Merge viewer-neko
2018-04-07 13:40:21 +02:00
536a99c7ae
MAINT-8428 FIXED [OSX] The 'Eyedropper' cursor is not shown in the world
2018-03-26 17:42:57 +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
985730a52c
Merge.
2017-05-18 17:40:24 +02:00
a4467e9ffe
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
2017-05-04 17:16:12 -04:00
127809e241
Merge with viewer64.
2017-04-10 15:15:11 +02: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
cc4ef52b97
Build fixes for C++11 on OS X. Includes several rebuilt libraries.
2016-06-21 15:57:18 -05:00
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
10b73565f2
Merge viewer-bear
2016-04-14 15:07:39 +02:00
c7e2c496ab
MAINT-6294 FIXED Cursor became invisible after typing in any input field (OS X)
2016-04-07 11:28:37 +03:00
df4205dc46
Merge viewer-bear
2016-04-02 03:52:29 +02: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
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
3980cdca3e
Merge
2015-12-09 07:11:36 +01: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
3f1a78cee9
Merge with CEF tip.
2015-11-24 15:28:05 +01: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
b260451633
Merge.
2015-11-09 12:21:49 +01:00
5449ae73b3
MAINT-5754: Finish key modifier experiment. Still not working.
2015-11-07 12:09:08 -08:00
Callum Linden