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
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
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
befb4449dc
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
b008385a50
FIRE-12732/MAINT-3585 FIXED Viewer Crashes when attempting to upload image
...
on OS X.
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.
Change'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
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
99cbf150a0
Merge LL V3.7.21
2015-01-15 13:55:17 +01:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01: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
c62ac0cae7
MAINT-3569 FIXED Handle window hide/unhide and minimize/unminimize events on mac.
2014-09-11 11:59:19 +03:00
ebd94bf07a
fixed: unwanted input window on OSX
2014-08-15 03:52:22 +09:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
1173dde898
Remove calls to now unused methods
2014-04-18 21:05:20 +00:00
b533844945
STORM-2023: Restore system color picker on OSX
2014-04-18 20:06:39 +00:00
3c3d74e487
STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite)
2014-10-23 12:45:05 -06:00
2455a0a8e0
Replaced even deprecated logging macros.
2014-06-11 18:24:52 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
1159ca7b87
Legacy cursor fix for OS X.
2014-05-21 08:49:44 -05:00
f6fd30d5c7
Compile fix for OSX. Partially disables legacy cursors.
2014-05-21 14:50:00 +02:00
5667f6806e
Proper fix for max OSX compiling.
2014-05-20 12:40:30 -07:00
bfcca01e5c
Hello, legacy cursor bug...
2014-05-20 21:05:00 +02:00
97a45e7597
Cleaning up legacy cursors and adding merge guard comments on changed code
2014-05-19 16:54:18 -07:00
c9719151d9
Fix legacy cursor hotspots on mac and linux builds
2014-05-18 20:28:10 -07:00
ee88720b8a
Backed out changeset: ec54b058227c
2014-05-18 20:02:31 -07:00
6a74754813
Dump broken legacy V1 cursors nobody seem to fix, miss or care about for over 2 years
2014-05-14 19:13:46 +02:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
976ad95977
Shot in the dark patch for MAINT-3353 backported from viewer-tiger
2013-11-05 13:01:25 -08:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
fe24e442a6
BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros
2013-08-14 20:50:26 -07:00
ee0b66f080
VITA test framework - record events support
2013-07-25 16:07:16 -04:00
6ca0bbe336
Fix for BUG-3364
2013-07-23 10:39:32 -04: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
dc7d287717
OPEN-170: "Set Window Size" always increases window size by specified size
2013-07-11 19:41:57 -04:00
b2bec3f99c
STORM-1942: dock icon bouncing unimplemented
2013-07-11 19:37:08 -04:00
2837ca7a47
This seems to be on par with viewer-release at this point.
2013-06-17 17:08:48 -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
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
aa0cb35db5
Support the committing of the current pre edit string when language input is interrupted per the viewer's original pre edit functionality.
2013-04-07 11:33:39 -04:00
5098d43a9b
STORM-1941: Cocoa project viewer: some coordinate conversions are off (Katharine Berry)
2013-04-01 08:25:11 -04:00
2656b1f405
First pass at adding a viable replacement for TSM's old UseInputWindow method (which is now deprecated with seemingly no Cocoa replacement).
2013-04-01 08:15:12 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
80a79e5d7b
IME support is pretty much finished at this point.
2013-03-27 08:49:45 -04:00
258b77b647
Additional IME support. LLPreeditor is largely good to go at this point, but there's still some work to do in getSegments.
2013-03-25 05:26:55 -04:00
64c0455db5
More LLPreeditor work.
2013-03-19 23:02:47 -04:00
ad26f3c390
IME support (and revamped text input support) semi-working.
2013-03-19 05:50:50 -04:00
3c60fb24ca
Merge
2013-03-11 10:26:52 -04:00
5caa7a465e
Bug fixing and prep-work for IME support (along with refactored text input in general).
2013-03-11 10:16:22 -04:00
d046e60657
Fix max VRAM detection on some cards and issues with sequencing of application of mem multiplier
2013-02-27 14:39:26 -08:00
f5516e0fc0
For MAINT-2404 Fixes detection of VRAM on OSX removed along with other AGL code. Code Review: callum
2013-02-27 06:46:53 -08:00
21aa4b9c24
Setup the quit handler for when the user attempts to close the window. This restores the previous functionality of asking the user if they want to quit.
2013-02-26 16:18:42 -05:00
e19db56688
Fix for antialiasing and VSync not being enabled properly.
2013-02-25 15:35:21 -05:00
4a935b6815
Fix inconsistent handling of Control, Alt, and Shift keys through a new modifier update callback.
2013-02-22 16:41:49 -05:00
bf1e9124f1
Restore the old Carbon crash handler, and more deprecated API removal.
2013-02-02 12:49:39 -05:00
e183ae134c
Don’t create a string we never use on OSX
2013-11-17 13:14:50 -07:00
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
c4b070ae00
merge changes for 3.6.5-release
2013-09-09 14:51:34 -04:00
7f50860af0
Avoid buffer overrun by not using depreciated getCharacters method. Use getCharacters:range instead.
2013-09-18 03:41:48 -06:00
ebd52759ba
Proposed fix for garbage chars at the end of pasted text introduced with 3.6.5 on OSX
2013-09-16 17:10:57 -06:00
51a64e6cac
Use CGLError not a U32 here
2013-09-15 13:28:24 -06:00
22e2fa7859
Fix setting the app window's title on osx
2013-09-09 21:47:32 -06:00
c69f3acef8
Merge LL 3.6.5
2013-09-09 19:07:03 -06:00
461ab912a5
Initial Cocoa drag and drop support.
2013-01-22 19:59:49 -05:00
1bbbaf8dd6
Partial workaround for mouse delta issue.
2013-01-18 13:16:12 -05:00
b04e00b2a3
Fix a few implicit double to float conversions, pedanticly add a few missing function prototypes
2013-07-28 14:41:32 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
9ea6a96be9
LLWindow merge fixes for Mac
2013-03-11 17:29:05 -04:00
09b07e3619
Big change set:
...
- LLAppDelegate header relocated to LLWindow. Definition is still present in secondlife-bin (for compatibility reasons when loading a nib).
- Return key handling fixed.
- Command key now acts the same as the control key by issuing control character codes when the command key is pressed.
- We now retrieve the window pointer directly from the app delegate in LLWindow.
2013-01-08 16:22:54 -05:00
9ce3ab1a52
Fixed the enter and return keys not being sent appropriately as unicode characters.
2013-01-02 18:53:44 -05:00
2b0f50dd82
Crash on exit fix + general code cleanup in LLWindowMacOSX.
2013-01-02 15:57:21 -05:00
Ansariel