Commit Graph

158 Commits (b3a549b8b5e01809b2dd2006d6bf92a7a4d6baf7)

Author SHA1 Message Date
AndreyL ProductEngine 1470e82c89 Merged in lindenlab/viewer-release 2019-04-02 21:51:54 +03:00
Ansariel 0e36db79e1 Merge viewer-neko 2018-12-01 16:34:33 +01:00
ruslantproductengine 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
ruslantproductengine 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
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
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
Nicky 985730a52c Merge. 2017-05-18 17:40:24 +02: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
Mnikolenko ProductEngine cd3608e661 SL-10023 FIXED Dragging mouse on World map sometimes causes cursor jump to the center of the screen 2018-11-16 15:53:52 +02: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 2fc4562c9f Merge viewer-bear 2016-04-23 11:52:26 +02:00
AndreyL ProductEngine 56f736b654 Merged in cinderblocks/storm-2127 2016-04-21 22:48:32 +03:00
Cinder c2c0c537bb STORM-2127 - Fix NSException when assigning values that don't exist in cocoa modifier key event. 2016-04-20 16:13:17 -06:00
Ansariel df4205dc46 Merge viewer-bear 2016-04-02 03:52:29 +02:00
Ansariel 10a4cc5f98 Merge Firestorm LGPL 2016-04-02 02:54:16 +02: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 1bba3dfbe4 Merge viewer-bear 2016-03-17 21:14:49 +01:00
Mnikolenko ProductEngine 9ed050e0e0 MAINT-3171 WIP Alt-clicking while moving mouse can move the camera significantly 2016-03-10 14:31:16 +02:00
Nicky 4b7fb09a47 Merge. 2015-12-21 19:16:34 +01: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
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
Nicky c218e524b2 Merge - Step 1; Still enough to do. 2015-10-26 20:20:13 +01:00
Nicky 2cdc06af0c Merge. 2015-10-05 17:09:58 +02:00
callum_linden 17ff449ae6 Supress error after Xcode 7 update: error: null passed to a callee that requires a non-null argument 2015-09-18 15:07:27 -07:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Oz Linden 905431cf60 merge changes for 3.7.25-release 2015-02-24 15:48:28 -05: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
simon 4f076daeff Merge downstream code and become 3.7.22 2014-12-02 10:41:20 -08:00
Brad Payne (Vir Linden) fe5ff3e74a merge 2014-12-01 16:21:52 -05:00
Tank_Master 22386b18b4 Merge LL 2.7.25 2015-02-24 21:22:32 -08:00
Ansariel 998ccb3fee FIRE-15500: Restore fix for FIRE-11648 that got lost in the merge with LL V3.7.21 2015-02-08 02:11:07 +01: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 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
callum_linden 73224a952a Update to build on Xcode 6.0: fix deprecated constant in OS X land 2014-10-17 15:39:13 -07:00
Oz Linden e43f3f4dae merge changes for OPEN-215 2014-10-13 17:21:22 -04:00
Oz Linden 852426d71e merge changes for 3.7.17-release 2014-10-13 17:13:15 -04:00
Mnikolenko ProductEngine b75d2f7c3f MAINT-3666 FIXED Update modifiers when viewer window becomes key window 2014-09-12 11:30:52 +03: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
Mnikolenko ProductEngine 7d9372b96d MAINT-4323 FIXED Mouselook - right-click locks cam position (mac-only) 2014-09-04 14:13:47 +03:00
Pell Smit ce7e8eb952 fixed: bad behavior of input window 2014-08-14 15:19:19 +09:00
Pell Smit ebd94bf07a fixed: unwanted input window on OSX 2014-08-15 03:52:22 +09:00
Pell Smit bef17f2af7 fixed: modifier key bug 2014-08-14 15:21:53 +09:00
Pell Smit e2370f6f2d fixed: inline backspace bug 2014-08-14 15:20:58 +09:00
Liny ac5d466639 Fix FIRE-14282/BUG-6875 with the solution provided in LL's jira. 2014-09-21 16:53:31 -07:00
Cinder Biscuits 60795c508e OPEN-215: Replace deprecated call to kCGLRPTextureMemory with kCGLRPTextureMemoryMegabytes 2014-04-14 23:08:50 +00:00
Ansariel 60006e25b9 Fix some bad refcount code and squash some potential leakiness on Mac; by Cinder Roxley 2014-08-26 21:36:25 +02:00
Mnikolenko ProductEngine 1108a34d1d MAINT-3907 FIXED Handle pressing of Alt/Shift/Control keys without any other key being pressed simultaneously. 2014-04-08 12:37:41 +03:00
Nicky 22e028c9ae Merge with lgpl tip. 2014-06-14 17:58:37 +02:00
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Cinder 03e396af4b Transplant cmd key fix to Mac64 branch
--HG--
branch : Mac64
2014-06-04 07:20:08 -06:00
Nicky fcc517f8e1 More OSX cocoa fixes. Call function with correct types instead of hacking around the type system to make the compiler happy. 2014-05-29 19:07:03 +02:00
Whirly ec8da7c32f FIRE-11882: Going fullscreen in OS X fails while inworld - patch from Cinder Roxley
--HG--
branch : Firestorm_4.6.5
2014-05-04 15:47:53 +01:00
Whirly 9066357849 FIRE-11882: Going fullscreen in OS X fails while inworld - patch from Cinder Roxley 2014-05-04 15:47:53 +01:00
simon cb2045fcd5 Merge downstream code with viewer-release 2014-02-10 16:11:50 -08:00
Nicky 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
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
Aura Linden ddd6b8f91b Mac Fullscreen fix for MAINT-3288 and MAINT-3135 2013-12-17 00:12:26 -08:00
Tonya Souther 07b5e702e6 BUG-3968: do not wear an object when renaming in inventory 2013-10-29 13:59:21 -04:00
Cinders 49bb37e11d WIP mac keyboard cleanup. Possibly fix sticky control. 2013-12-02 19:17:26 -07:00
Graham Madarasz (Graham Linden) 9b99ece5ab MAINT-3135 WIP partial fix, addresses graphics corruption on resize, but not mouse mapping issues 2013-09-12 13:17:43 -07:00
Geenz dea416fd83 Rework the command+click functionality a bit to ensure we're not mistakenly simulating a right click where we shouldn't. 2013-07-11 22:07:17 -04:00
Geenz a787e272c3 Alert box support! 2013-07-11 21:31:17 -04:00
Geenz 72bb473c9e Ensure that the correct method is called when we're simulating a right click. 2013-07-11 18:59:28 -04:00
Geenz 6fbafaf056 Restore control + right click functionality. 2013-07-11 18:41:16 -04:00
Geenz 623077e6a4 Added license headers. 2013-06-27 15:06:03 -04:00
Geenz 860b86e3d1 Fix for down key presses not opening up the IME character selection window, and inadvertently being handled while marked text is selected. 2013-06-27 13:48:44 -04:00
Geenz 90e511bbdf Handle VRAM in megabytes. This was previously being reported as bytes. 2013-06-20 11:28:05 -04:00
Geenz 2837ca7a47 This seems to be on par with viewer-release at this point. 2013-06-17 17:08:48 -04:00
Geenz 84f287b34e Moved detecting if we're using a roman-script language to it's own function in the application delegate. Also consider the delete and backspace characters to be special cases. 2013-06-17 12:31:25 -04:00
Geenz 2253d22eb8 Have showInputWindow hand off input events to the bottom line input window. 2013-06-17 10:28:32 -04:00
Geenz 440a1ee3ba Move logic involving the input window to keyDown. Pass input events to the input window from there. 2013-06-17 09:26:11 -04:00
Geenz 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
Geenz f8abfb63c3 This brings us to feature parity with CHUI for IME support. 2013-06-17 07:52:19 -04:00
Geenz 7decac40e6 Override NSPanel's close method to hide the window instead of actually removing the window. 2013-05-23 09:39:49 -04:00
Geenz 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
Geenz 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
Geenz 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
Geenz 80a79e5d7b IME support is pretty much finished at this point. 2013-03-27 08:49:45 -04:00
Geenz 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
Geenz 6c200a94f7 Fix for command key presses + a letter not triggering keyUp. Fix by Katharine Berry. 2013-03-23 01:05:21 -04:00
Geenz 64c0455db5 More LLPreeditor work. 2013-03-19 23:02:47 -04:00
Geenz ebe320e7c3 Refactored LLNSWindow and LLOpenGLView significantly. All input goes through LLOpenGLView now. 2013-03-19 06:32:56 -04:00
Geenz ad26f3c390 IME support (and revamped text input support) semi-working. 2013-03-19 05:50:50 -04:00
Geenz 3c60fb24ca Merge 2013-03-11 10:26:52 -04:00
Graham Madarasz (Graham Linden) 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
Graham Madarasz (Graham Linden) 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
Geenz 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
Geenz e19db56688 Fix for antialiasing and VSync not being enabled properly. 2013-02-25 15:35:21 -05:00
Geenz 4a935b6815 Fix inconsistent handling of Control, Alt, and Shift keys through a new modifier update callback. 2013-02-22 16:41:49 -05:00
Cinders 4ff26225e7 Fix sporadic texture reloading on OSX 2013-10-22 11:34:10 -06:00
Cinders 3d9f82f929 Use kCGLRPTextureMemoryMetabytes in place of deprecated kCGLRPTextureMemory 2013-10-12 20:59:48 -06:00
Tonya Souther b8e8cd021d FIRE-11828: Don't process Return or keypad Enter twice on OS X. 2013-10-06 18:12:10 -05:00
Geenz c52e6f9c59 Refactor the key input handling to make it easier to filter out keys we don't need unicode characters for (such as the arrow keys). 2013-01-23 09:29:32 -05:00