c4333e2222
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llinventory/llsettingssky.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
2025-06-16 12:55:12 +02:00
a0be1e7dfb
macOS 26 build changes ( #4239 )
...
* Fix for VLAs now emitting warnings on Xcode 26, and AGL being removed from the SDK.
Note: there was no warning or notice provided for AGL's removal.
* Whitespace.
2025-06-10 14:15:57 -04:00
394c8e17d5
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llfontfreetype.cpp
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/lltextbase.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llinventorygallery.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/floater_emoji_picker.xml
2024-01-26 00:32:06 +01:00
0d8bd79c79
SL-20750 MacOS Crash processing attributed string
2024-01-11 17:18:12 +02:00
b32cd27b4c
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/cmake/ViewerMiscLibs.cmake
# indra/llmath/llvolume.cpp
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
# indra/newview/llviewermenu.cpp
2023-12-18 19:25:49 +01:00
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
f072b3f952
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
2023-11-30 19:16:29 +01:00
54db4206e9
SL-19801 Inserting emoji characters from system emoji picker does not work on macOS
2023-11-30 15:57:35 +01:00
9ac97bed1a
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llopenglview-objc.mm
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
2023-06-19 11:39:41 +02:00
cb8c91ffc8
SL-19881 fix assertion failure in [NSEvent characters]
2023-06-15 14:39:05 -07:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
426ebef98c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/threadpool.h
# indra/llwindow/llwindowwin32.cpp
2022-12-23 11:23:30 +01:00
cf3f577e32
SL-18384 Fix NSException for keyboard handling
...
Affects accent keys for diacritical marks
2022-12-22 23:03:19 +01:00
07baa83ef2
SL-18384 Fix NSException for keyboard handling
...
Affects accent keys for diacritical marks
2022-12-16 16:31:42 +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
1f176fdc18
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llglslshader.cpp
# indra/llrender/llpostprocess.cpp
# indra/llrender/llrender.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
2022-09-13 20:11:44 +02:00
2082443220
SL-17967 - Git rid of ARB that is in core
2022-09-01 10:58:27 -07:00
5828659a4f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-30 21:56:48 +02:00
3b70c9d49c
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into initscapade
2022-08-30 10:20:15 -07:00
509cfcad31
experiments for turning on opengl core profile on mac for DRTVWR-559
2022-08-26 09:30:01 -07:00
d4b7880dfe
Remove extra ']'.
2022-08-17 15:32:28 +02:00
0243626011
SL-16985 FIXED [Mac] Key combinations for diacritical marks are not working
2022-08-16 13:42:07 +02:00
2205a61ae6
Speculative fix for FIRE-31473: Accessing "characters" property outside key-up or key-down event is not allowed according to the API doc - not sure if flagsChanged does count as such though (hopefully it compiles...)
2022-08-16 13:41:27 +02: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
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
10e9e3ca1b
SL-16985 FIXED [Mac] Key combinations for diacritical marks are not working
2022-03-11 13:41:06 +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
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
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00: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
fe10f171d3
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/strings.xml
2020-09-09 19:34:33 +02:00
acfbb41f4d
SL-13813 The current line is not selected after triple-clicking text in notecard on the macOS
2020-08-20 19:49:23 +03:00
146d527104
Merge viewer-neko
2019-10-09 22:05:52 +02:00
12baf75878
Downstream merge from lindenlab/viewer-manul
2019-10-09 19:32:19 +03:00
fe490d52b4
Merged in lindenlab/viewer-xcode11
2019-10-09 19:28:30 +03:00
134155eae1
Merge Firestorm LGPL
2019-09-30 19:10:59 +02:00
c0834a7c4c
Xcode 11 compile fix.
2019-09-28 18:51:04 -05:00
52c9f57819
DRTVWR-476: Track change to NSView in Xcode 11's 10.15 SDK.
2019-09-25 16:48:36 -04: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
a0bf70b41d
SL-11592 [Mac] Ability to bind extra mouse buttons for push to talk
2019-07-18 19:18:02 +03:00
bed0ff96ba
Merge viewer-neko
2019-06-22 21:01:07 +02:00
b813814202
SL-11432 FIXED [OSX] Avatar is spinning when pressing Alt+D+Command and then releasing D key
2019-06-20 15:41:27 +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
84d721c678
Merge Firestorm LGPL
2019-04-02 23:01:30 +02:00
Ansariel