431b3b0c6d
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/workflows/pre-commit.yaml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llwindow/llopenglview-objc.mm
# indra/newview/CMakeLists.txt
# indra/newview/llappdelegate-objc.mm
2025-10-20 23:56:48 +02:00
11f73b0e7f
Fix tabs and trailing spaces in objc sources
2025-10-20 19:39:49 +03:00
b99cf9fb86
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
a46d4f0f69
Enable deprecation warnings and suppress a small handful that have no modern replacements
2025-08-22 03:32:02 -04:00
e5ccf7a2a3
Remove dead code for macos versions 10.6 and older
2025-08-22 03:08:28 -04:00
f0db568bf8
Rework macOS retina support to remove deprecated code and fix scaled input issues in multimonitor
2025-08-20 17:57:06 -04:00
77514ebddd
Fix macOS deprecation warnings
2025-08-19 08:58:49 -04:00
63f30264ff
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/newview/app_settings/settings.xml
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llinspectavatar.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llviewerjoystick.cpp
2023-10-26 20:58:56 +02:00
9b27b6e509
SL-13610 [MAC] WIP List HID available devices in joystick selection
...
Doesn't filter the list yet, just shows full list of usb devices
Selecting visible devices doesn't work yet
2023-10-23 15:26:19 +03:00
f7f941ae5b
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.cpp
2023-02-03 13:06:40 +01:00
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
63494cf5c9
SL-12456 Potential fix for NSPersistentUIFileManager crash
...
NSPersistentUIFileManager is supposed to be responsible for restoring window position and size
2023-01-12 23:37:25 +02:00
cb10f3b149
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
2022-11-11 12:15:54 +01:00
83466b301a
Clean up autorelease behavior in llwindowmac and additional leaks
2022-10-28 18:53:34 -04:00
97ea17e6e9
Fix leak of copy and paste on mac
2022-10-28 18:50:38 -04:00
94eff7cb1f
Remove remnants of a change long gone already - maybe this might be a reason it causes FIRE-31473 now in conjunction with 83127d2299
2022-08-16 13:18:08 +02:00
009afb2f51
SL-16789 FIXED [MAC] only default cursor is shown after nstalling the Viewer in a directory with a non-ASCII name
2022-02-14 12:51:30 +01: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
e62a54a643
Merge fix
2019-10-20 18:47:24 +02:00
6d377d07fa
Merge viewer-neko
2019-05-04 01:02:28 +02:00
468fbd6b51
Return CGPoint and CGSize by value, not const ref to temporary.
2019-04-25 15:11:55 -04: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
445b66a93e
Merge viewer-cougar
2019-02-07 23:45:34 +01:00
6c8cfff7ab
SL-10176 - [Love Me Render] MacOS Quit / Shutdown crash
2018-12-11 18:11:58 +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
a226bbd055
Merge viewer-cougar
2018-09-25 17:57:19 +02:00
20a2019e4b
MAINT-9076 Improved support for Retina Displays
2018-09-03 17:22:15 +03: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
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
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
611182f8b2
FIRE-14254: Fix for crash on logout after cmd-control patch. Fix by Cinder Roxley.
2014-07-31 12:39:48 -05:00
dc353c205a
Merge
2014-06-10 20:27:31 -07:00
fd55bc6ded
Make sure to grab current modifiers on keypress/mouse so they don't get stuck until pressed again.
2014-04-07 18:00:36 +02:00
8ecffc2581
Create a properly 0-terminated string to avoid pasting unicode garbage.
2014-04-07 17:51:18 +02:00
ddd6b8f91b
Mac Fullscreen fix for MAINT-3288 and MAINT-3135
2013-12-17 00:12:26 -08:00
522a4d02e3
MAINT-3506 FIXED Allocate appropriate amount of memory for temp variable.
2013-12-03 14:37:55 +02:00
c775ae7cbd
MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for SLURL handling
2013-09-26 18:53:12 -07:00
2f680eec93
A bit of cleanup and make the return of showAlert match the OSBTN return types in llwindow.h.
2013-07-11 21:46:10 -04:00
a787e272c3
Alert box support!
2013-07-11 21:31:17 -04:00
b2bec3f99c
STORM-1942: dock icon bouncing unimplemented
2013-07-11 19:37:08 -04:00
623077e6a4
Added license headers.
2013-06-27 15:06:03 -04:00
2837ca7a47
This seems to be on par with viewer-release at this point.
2013-06-17 17:08:48 -04:00
2253d22eb8
Have showInputWindow hand off input events to the bottom line input window.
2013-06-17 10:28:32 -04:00
93531f3ba8
Insert text into the input window when we attempt to insert text without a pre-editor. Also handle backspace as a special case when determining if the input window needs to be displayed.
2013-06-17 08:59:01 -04:00
cda10266ae
Only show the input window when we attempt to add marked text, *and* we can't submit marked text directly to the viewer.
2013-05-23 08:50:05 -04:00
Ansariel