Commit Graph

210 Commits (fcb454cbd7d08e8518028a7d2e929fbbfef45b78)

Author SHA1 Message Date
Ansariel fcb454cbd7 Merge viewer-cougar 2018-11-14 19:44:40 +01:00
ruslantproductengine 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
ruslantproductengine 6ce18422de SL-9766 [Render] [Mac] Alt + left mouse click has severely impaired functions 2018-10-19 19:12:08 +03:00
Ansariel a226bbd055 Merge viewer-cougar 2018-09-25 17:57:19 +02:00
ruslantproductengine 20a2019e4b MAINT-9076 Improved support for Retina Displays 2018-09-03 17:22:15 +03:00
Ansariel 9203b70ca3 Merge viewer-neko 2018-04-07 13:40:21 +02:00
Mnikolenko ProductEngine 536a99c7ae MAINT-8428 FIXED [OSX] The 'Eyedropper' cursor is not shown in the world 2018-03-26 17:42:57 +03:00
Nicky 985730a52c Merge. 2017-05-18 17:40:24 +02:00
Nat Goodspeed a4467e9ffe Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11 2017-05-04 17:16:12 -04:00
Nicky 127809e241 Merge with viewer64. 2017-04-10 15:15:11 +02:00
callum@lindenlab.com 398c351371 First pass at osx/macos keyboard events - simple case like google homepage is working 2017-03-03 15:32:47 -08:00
Nat Goodspeed 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
Tonya Souther cc4ef52b97 Build fixes for C++11 on OS X. Includes several rebuilt libraries. 2016-06-21 15:57:18 -05:00
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Ansariel 10b73565f2 Merge viewer-bear 2016-04-14 15:07:39 +02:00
Mnikolenko ProductEngine c7e2c496ab MAINT-6294 FIXED Cursor became invisible after typing in any input field (OS X) 2016-04-07 11:28:37 +03:00
Ansariel df4205dc46 Merge viewer-bear 2016-04-02 03:52:29 +02:00
Mnikolenko ProductEngine 272d40a089 MAINT-6239 [Mac] Computer cursor appears attached to crosshair after using modifier keys in mouselook 2016-03-29 13:30:00 +03:00
Mnikolenko ProductEngine ca1d7da571 MAINT-3171 Alt-clicking while moving mouse can move the camera significantly 2016-03-21 17:58:39 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Nicky 3980cdca3e Merge 2015-12-09 07:11:36 +01:00
rider 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
Nicky 3f1a78cee9 Merge with CEF tip. 2015-11-24 15:28:05 +01:00
rider c2ad041c23 Encode keyboard event for reconstruction in the plugin. 2015-11-13 16:22:34 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky b260451633 Merge. 2015-11-09 12:21:49 +01:00
rider 5449ae73b3 MAINT-5754: Finish key modifier experiment. Still not working. 2015-11-07 12:09:08 -08:00
rider bd817f6f42 MAINT-5754: Basic keyboard functionality on the Mac. Still incomplete 2015-11-06 14:12:30 -08:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
ruslantproductengine 90573badb4 MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
ruslantproductengine befb4449dc MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
Oz Linden dab5acd972 merge changes for 3.7.22-release 2014-12-15 12:34:18 -05:00
callum_linden 4c597c548f Fix up remaining llround() -> ll_round() issues 2014-12-12 11:03:56 -08:00
Brad Payne (Vir Linden) 6cffbfba8b merge 2014-12-02 14:48:45 -05:00
Brad Payne (Vir Linden) fe5ff3e74a merge 2014-12-01 16:21:52 -05:00
ruslantproductengine 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
ruslantproductengine 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
Ansariel e52d57cba2 Merge LL V3.7.23 2015-01-15 15:44:43 +01:00
Ansariel 99cbf150a0 Merge LL V3.7.21 2015-01-15 13:55:17 +01:00
Ansariel a45088cb6b Merge LL V3.7.11 2015-01-12 12:54:15 +01:00
Oz Linden a837281a77 merge changes for STORM-2081 2014-10-23 16:07:31 -04:00
Cinder 47854b6218 STORM-2081 - Guard against null gWindowImplementation when fullscreen (crashes OS X Yosemite) 2014-10-23 12:45:05 -06:00
callum_linden 392d63efac Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable] 2014-10-17 15:39:48 -07:00
Mnikolenko ProductEngine c62ac0cae7 MAINT-3569 FIXED Handle window hide/unhide and minimize/unminimize events on mac. 2014-09-11 11:59:19 +03:00
Pell Smit ebd94bf07a fixed: unwanted input window on OSX 2014-08-15 03:52:22 +09:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00