Commit Graph

147 Commits (97a45e7597b5eeeda4dcd68e43df307a7c99b386)

Author SHA1 Message Date
Liny 97a45e7597 Cleaning up legacy cursors and adding merge guard comments on changed code 2014-05-19 16:54:18 -07:00
Liny c9719151d9 Fix legacy cursor hotspots on mac and linux builds 2014-05-18 20:28:10 -07:00
Liny ee88720b8a Backed out changeset: ec54b058227c 2014-05-18 20:02:31 -07:00
Ansariel 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
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
Aura Linden 976ad95977 Shot in the dark patch for MAINT-3353 backported from viewer-tiger 2013-11-05 13:01:25 -08:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Jeff (Gioffredo Linden) ee0b66f080 VITA test framework - record events support 2013-07-25 16:07:16 -04:00
Geenz 6ca0bbe336 Fix for BUG-3364 2013-07-23 10:39:32 -04:00
Geenz 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
Geenz a787e272c3 Alert box support! 2013-07-11 21:31:17 -04:00
Geenz dc7d287717 OPEN-170: "Set Window Size" always increases window size by specified size 2013-07-11 19:41:57 -04:00
Geenz b2bec3f99c STORM-1942: dock icon bouncing unimplemented 2013-07-11 19:37:08 -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 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 3779e51bfc Merged with https://bitbucket.org/lindenlab/viewer-beta 2013-05-13 22:22:51 -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 5098d43a9b STORM-1941: Cocoa project viewer: some coordinate conversions are off (Katharine Berry) 2013-04-01 08:25:11 -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
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07: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 64c0455db5 More LLPreeditor work. 2013-03-19 23:02:47 -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
Geenz 5caa7a465e Bug fixing and prep-work for IME support (along with refactored text input in general). 2013-03-11 10:16:22 -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
Geenz bf1e9124f1 Restore the old Carbon crash handler, and more deprecated API removal. 2013-02-02 12:49:39 -05:00
Cinders e183ae134c Don’t create a string we never use on OSX 2013-11-17 13:14:50 -07:00
Tank_Master 6007d1235e merge snowstorm repo 2013-10-19 23:48:44 -07:00
Oz Linden c4b070ae00 merge changes for 3.6.5-release 2013-09-09 14:51:34 -04:00
Cinders 7f50860af0 Avoid buffer overrun by not using depreciated getCharacters method. Use getCharacters:range instead. 2013-09-18 03:41:48 -06:00
Cinders 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
Cinders 51a64e6cac Use CGLError not a U32 here 2013-09-15 13:28:24 -06:00
Cinders 22e2fa7859 Fix setting the app window's title on osx 2013-09-09 21:47:32 -06:00
Cinders c69f3acef8 Merge LL 3.6.5 2013-09-09 19:07:03 -06:00
Geenz 461ab912a5 Initial Cocoa drag and drop support. 2013-01-22 19:59:49 -05:00
Geenz 1bbbaf8dd6 Partial workaround for mouse delta issue. 2013-01-18 13:16:12 -05:00
Cinders b04e00b2a3 Fix a few implicit double to float conversions, pedanticly add a few missing function prototypes 2013-07-28 14:41:32 -06:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
prep 9ea6a96be9 LLWindow merge fixes for Mac 2013-03-11 17:29:05 -04:00
Geenz 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
Geenz 9ce3ab1a52 Fixed the enter and return keys not being sent appropriately as unicode characters. 2013-01-02 18:53:44 -05:00
Geenz 2b0f50dd82 Crash on exit fix + general code cleanup in LLWindowMacOSX. 2013-01-02 15:57:21 -05:00
Geenz ddb48d51d9 More things in this commit:
- Removed the callback system in favor of simply defining functions in a header to later be implemented in whichever file is most convenient for what we want to do (i.e., calling LLWindow callbacks within LLWindowMacOSX, setting cursors in llwindowmacosx-objc.mm, etc.)
- Viewer shutdown now works appropriately
- Added a bit of debugging code to test if a key has been handled by the UI or not (useful for tracking down the mystery of the enter key not being handled)
- Setup a cocoa quit handler within the application delegate that intercepts any termination requests
2013-01-01 11:32:53 -05:00