Commit Graph

25284 Commits (2b0f50dd821848d18ab35095623c3bdbcdeb910c)

Author SHA1 Message Date
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
Geenz 7a1593c083 Added requisite SecondLife.nib file required for compiling the viewer. 2012-12-29 07:00:34 -05:00
Geenz bd152c1fb7 Huge amount of refactoring to use Cocoa here:
- Updated to .xib format.  To produce a new nib (which is required after changing the xib file), use "ibtool SecondLife.xib --compile SecondLife.nib" within the newview directory.
- xib file now defines the viewer's window.  VIews are still being pragmatically added to the main window.  This may change in the future.
- LLAppViewer's main loop has been slightly refactored to be executed on a timer for OS X.  This probably needs a bit more work.
- Event handling still needs more work to work within a timer based event loop.  It works fairly sporadically at the moment, as if events are being dropped between timer executions, at least for the mouse.
- Carbon has been purged from the viewer's startup, and from LLWindow entirely.  There's likely still a few odds and ends fragmented throughout the viewer and its dependencies.  Need to track these down.
- LLAppViewerMacOSX now uses NSApplicationMain, and also implements the NSApplicationDelegate protocol in LLAppDelegate.
- Fullscreen support has been implemented for OS X 10.7+
This is still a work in progress, however at this stage everything needed for a functional viewer is (mostly) complete.  From here, it's mostly just bug hunting and fixing.
2012-12-29 06:59:43 -05:00
Geenz c8aa1fb7c8 LLWindow: Move to using Cocoa for window and view creation along with setting up callbacks for event handling as such. 2012-12-17 18:00:30 -05:00
Aura Linden b6abf5c0ee Merged 2012-12-16 17:48:32 -08:00
Aura Linden c1db961ab9 Fixed small one-time memory leaks. 2012-12-16 17:45:55 -08:00
Aura Linden 5c9dd94e19 BOOL vs bool FIGHT 2012-12-14 21:41:02 +00:00
Aura Linden 3a72577f39 Fixes from Oz's merge. 2012-12-13 18:27:32 -08:00
Oz Linden 8e99b82645 merge changes for DRTVWR-244 2012-12-13 15:29:07 -05:00
Oz Linden e2bd5f7a9d tag merge of DRTVWR-244 2012-12-13 15:29:01 -05:00
Aura Linden 2282d6b11a Fixed whitespace issues for merge. 2012-12-13 12:24:17 -08:00
Aura Linden e85e6ca410 Merged from viewer-release 2012-12-11 16:01:35 -08:00
Aura Linden 6b059d183b Crash reporter fixed, debugging removed. 2012-12-11 07:40:26 -08:00
Aura Linden 53ea30af06 Interim debug checkin to test from teamcity 2012-12-11 06:56:14 -08:00
Oz Linden edcdce226a merge changes for DRTVWR-260 2012-12-10 15:33:39 -05:00
Oz Linden d33ab2d3e0 tag merge of DRTVWR-260 2012-12-10 15:33:34 -05:00
Oz Linden a0d3781666 pull back release tags 2012-12-10 15:32:26 -05:00
Oz Linden a334f41f8e Added tag 3.4.3-release for changeset 5cba5f39d0a8 2012-12-10 15:24:49 -05:00
Oz Linden 623a06aabd merge release tag 2012-12-10 15:24:08 -05:00
Logan Dethrow 7e59b10413 Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake. 2012-12-07 19:38:12 -05:00
Logan Dethrow b6a7c8fcfd Merge in backed out changes. 2012-12-07 17:50:37 -05:00
Logan Dethrow 954200e97f Backed out changeset 69636bceb5a2. 2012-12-07 17:48:50 -05:00
Logan Dethrow 77f58a7524 Backed out changeset 227671259809. 2012-12-07 17:48:10 -05:00
Logan Dethrow 8aa32015a9 Backed out changeset 5cf865a7afa7 2012-12-07 17:47:03 -05:00
Aura Linden 2b3bcdbcbb Added compiled AutoUpdater.nib made from new AutoUpdater.xib 2012-12-06 21:01:39 -08:00
Aura Linden e21275f356 Fixed several minor issues with validation. 2012-12-06 21:00:37 -08:00
Nat Goodspeed b6bf90c042 merge changes for MAINT-1955 2012-12-05 22:15:08 -05:00
Nat Goodspeed a9ada0cc6a merge changes for DRTVWR-259 2012-12-05 20:08:32 -05:00
Nat Goodspeed 168040bad2 tag merge of DRTVWR-259 2012-12-05 20:08:26 -05:00
Nat Goodspeed 4c384aa4ab merge changes for MAINT-1951 2012-12-05 20:07:25 -05:00
Nat Goodspeed e1da5bda78 merge changes for DRTVWR-257 2012-12-05 18:18:16 -05:00
Nat Goodspeed c5aeb0667f tag merge of DRTVWR-257 2012-12-05 18:18:12 -05:00
Nat Goodspeed 476f6a0990 merge changes for MAINT-1953 2012-12-05 18:17:00 -05:00
Nat Goodspeed 8a019b961b merge changes for DRTVWR-258 2012-12-05 16:02:59 -05:00
Nat Goodspeed ea98a58e36 tag merge of DRTVWR-258 2012-12-05 16:02:52 -05:00
Nat Goodspeed 0354b47a8f merge changes for MAINT-1979 2012-12-05 16:01:37 -05:00
Nat Goodspeed d9bcaf1821 merge changes for DRTVWR-256 2012-12-05 13:58:31 -05:00
Nat Goodspeed 907abfefc6 tag merge of DRTVWR-256 2012-12-05 13:58:09 -05:00
Nat Goodspeed 377544c8b4 merge changes for MAINT-1955, MAINT-1958 2012-12-05 12:05:33 -05:00
Nat Goodspeed 5a938e3a1c merge changes for DRTVWR-254 2012-12-05 09:36:38 -05:00
Nat Goodspeed e6712cab31 tag merge of DRTVWR-254 2012-12-05 09:36:26 -05:00
Nat Goodspeed b078a515e1 merge changes for DRTVWR-253 2012-12-04 21:13:35 -05:00
Nat Goodspeed bb0fd8745b tag merge of DRTVWR-253 2012-12-04 21:13:26 -05:00
Nat Goodspeed cc2c426e88 merge changes for BUG-768 2012-12-04 21:10:30 -05:00
Dave Parks 1f2b88803e MAINT-1953 Run through viewer stats and update GPU table with missing entries and new expected OpenGL versions 2012-12-04 16:10:15 -06:00
Nat Goodspeed 87b4386ac6 merge changes for DRTVWR-251 2012-12-04 17:09:23 -05:00
Nat Goodspeed 7515736c68 tag merge of DRTVWR-251 2012-12-04 17:09:06 -05:00
Nat Goodspeed 68fffbc5e3 merge changes for MAINT-1953 2012-12-04 16:33:44 -05:00
Nat Goodspeed a15ec8d014 tag merge of DRTVWR-255 2012-12-04 11:06:29 -05:00