Commit Graph

523 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Nicky 2455a0a8e0 Replaced even deprecated logging macros. 2014-06-11 18:24:52 +02:00
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07: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
Tonya Souther 1159ca7b87 Legacy cursor fix for OS X. 2014-05-21 08:49:44 -05:00
Nicky f6fd30d5c7 Compile fix for OSX. Partially disables legacy cursors. 2014-05-21 14:50:00 +02:00
Liny 5667f6806e Proper fix for max OSX compiling. 2014-05-20 12:40:30 -07:00
Ansariel bfcca01e5c Hello, legacy cursor bug... 2014-05-20 21:05:00 +02:00
Liny 2ced379763 Removing a missed gSavedSettings call from llwindow legacy cursors recode 2014-05-19 19:19:26 -07:00
Liny abe269ac06 Fixing merge comments 2014-05-19 19:14:05 -07:00
Liny 1d0d21b5f5 Fixing linux build 2014-05-19 19:13:32 -07:00
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
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07: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
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
simon 52ce788d0c Pull in viewer-lion to lock down next release 2014-02-18 16:41:21 -08:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08: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
Nicky 8ecffc2581 Create a properly 0-terminated string to avoid pasting unicode garbage. 2014-04-07 17:51:18 +02:00
simon 2ccebebece More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08: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
Mnikolenko ProductEngine 522a4d02e3 MAINT-3506 FIXED Allocate appropriate amount of memory for temp variable. 2013-12-03 14:37:55 +02:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Oz Linden d1b4c5bf73 merge changes for 3.6.10-release 2013-11-11 16:40:22 -05:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -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
Tonya Souther 07b5e702e6 BUG-3968: do not wear an object when renaming in inventory 2013-10-29 13:59:21 -04:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Oz Linden 4dccf30bf3 merge changes for 3.6.7-release 2013-10-03 18:04:27 -04:00
Graham Madarasz (Graham Linden) 4bc9393240 MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for SLURL handling 2013-09-26 18:53:12 -07:00
Cinders 49bb37e11d WIP mac keyboard cleanup. Possibly fix sticky control. 2013-12-02 19:17:26 -07:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
maksymsproductengine 932882da22 Merge with bitbucket.org/msavchenko/viewer-release-maint-3132 2013-09-19 01:17:12 +03:00
simon 33e70236f0 MAINT-3161 : Clean up avatar muting code and prototype feature 2013-09-17 17:01:52 -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
Oz Linden 6a9d23b71a merge changes for open-189 2013-09-12 14:07:12 -04:00
Drake Arconis 0142a0c6a9 OPEN-189 Add missing header guard 2013-09-11 19:02:36 -04:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
simon e7ac4695e3 Merge viewer-release 2013-09-09 12:59:17 -07:00
Oz Linden c4b070ae00 merge changes for 3.6.5-release 2013-09-09 14:51:34 -04:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Oz Linden a359d9d80c merge changes for 3.6.4-release 2013-08-27 10:37:02 -04:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07:00