Commit Graph

201 Commits (092a09074795b4dcaec3c37febef7b43bae7c461)

Author SHA1 Message Date
Ansariel 2d85844a3a FIRE-18245: Taskbar icon only flashes if window is minimized, not if unfocused 2016-05-04 10:42:05 +02:00
Nicky 46d5cd7f24 Merge with https://bitbucket.org/callum_linden/viewer-cef 2015-09-03 14:38:13 +02:00
callum_linden 1db2c7276d Merge with viewer-release 2015-08-31 11:17:28 -07:00
Ansariel 286430cf15 Unsafe Win64 code fix by Drake Arconis 2015-07-17 11:56:21 +02:00
callum_linden 83a9ae7b3c New keyboard code for windows that uses system messages directly and works ok. Points to new LLCEFLib 2015-07-15 02:27:33 +01:00
andreykproductengine de5307ab1d MAINT-4874 FIXED Actions that require a double click "randomly" fail - repro & cause found for BUG-7753 2015-03-05 19:03:23 +02:00
andreykproductengine cfba0b8b8b MAINT-4874 FIXED Actions that require a double click "randomly" fail - repro & cause found for BUG-7753 2015-03-05 19:03:23 +02:00
Ansariel 4d840e00a2 Backup f9628f6e4492 (temporary fix for FIRE-15529) - LL fix is coming next 2015-04-17 00:57:24 +02:00
Ansariel 3f7fd62bea FIRE-15529: Possible fix for double clicks not working after giving focus back to the viewer 2015-02-11 13:25:26 +01:00
Ansariel a1fd8230bf Merge LL V3.7.12 2015-01-12 17:56:50 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Nicky a755c04c29 Make OSMessageBoxWin32 displays proper extended characters. 2014-10-01 17:12:55 +02:00
simon 592024b580 Merge viewer-release and become version 3.7.9 2014-06-17 10:40:42 -07:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
Stinson Linden 592b7e2fdf MAINT-4009: Correcting a pointer deletion that should have correctly been an array deletion. 2014-04-24 00:35:14 +01:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -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 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
Dave Parks 02423199e8 Automated merge with https://bitbucket.org/lindenlab/viewer-lion 2014-03-11 17:42:02 -05:00
andreylproductengine 2ae011dc5c MAINT-3786 FIXED When bringing focus back to the viewer with a single click
in world view, a double click teleport to clicked point happens under certain
circumstances
2014-03-11 19:22:11 +02:00
Dave Parks a8e22e11c5 MAINT-2980 Rename "Texture Memory" to "Video Memory" in hardware floater and increase limit.
Limit should be however much vram is installed, but underneath the hood, fudge
how much memory is used for textures to avoid swapping.

Also, catch exceptions when attempting to build a GL context on windows and
display an error dialog instead of crashing.
2014-02-27 17:49:50 -06:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07: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
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
maksymsproductengine 152d76e13e MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer goes blank if location is selected and a menu item is seleted 2013-07-30 20:03:21 +03:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Merov Linden 2113bb8159 Pull merge from viewer-release 2013-05-22 11:23:51 -07:00
maksymsproductengine 1c5659b1ca CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0 2013-04-25 20:02:36 +03:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Nicky ed4c40a7ab Merge with -lgpl 2013-10-14 20:57:33 +02:00
Nicky 329ca38457 Merge with -lgpl. 2013-09-14 23:23:26 +02:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Cinders db4543dbf8 Adhere to standard OSX app practices and bounce the icon whenever Firestorm is not the active app 2013-10-02 00:32:36 -06:00
Nicky 0addf213ed Merge with FS tip. First pass. 2013-08-02 00:40:48 +02:00
Nicky bdee194522 Fix some easy little pointer confusions for 64 bit versions. 2013-08-01 23:52:49 +02: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
Richard Linden 9d77e030d9 SH-3406 WIP convert fast timers to lltrace system
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Don Kjer d3924200b6 Removing unused gHeadlessClient code from viewer 2012-09-23 03:06:11 +00:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Todd Stinson bf1c1947d7 PATH-743: Updating the cursors for path testing mode to final designs. 2012-06-25 14:28:21 -07:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00