Commit Graph

402 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
Ansariel c4e18fbcaa Merge viewer-neko 2018-02-27 18:08:48 +01:00
Graham Linden graham@lindenlab.com 06bce2ddd0 Add debug setting and code to allow nVidia nSight graphics debugging to capture SL frames.
These changes are only enabled if RenderNsightDebugSupport is true and eliminate use of
some OpenGL legacy functionality which is incompatible with nSight capture
(mostly glReadPixels and other fixed-function pipe rendering calls).
2018-02-15 21:55:24 +00:00
Ansariel 25350b9422 Merge viewer-neko 2018-01-30 15:39:28 +01:00
andreykproductengine 3b73cec39e Build fix for non-dpi aware environment 2018-01-19 19:42:57 +02:00
andreykproductengine af3bf74eea MAINT-8183 Additional logging 2018-01-17 18:46:56 +02:00
Ansariel f6e3684f6e Merge Firestorm LGPL 2018-01-17 12:07:54 +01:00
AndreyL ProductEngine 57a99273ed Merged in lindenlab/viewer-release 2018-01-17 03:20:12 +02:00
Ansariel e7715f7a31 Merge Firestorm LGPL 2017-11-30 20:33:07 +01:00
Ansariel c9e417c8a6 Merge viewer-neko 2017-11-30 01:19:29 +01:00
Ansariel 34b2565d4a FIRE-12561: f.lux custom color profile will cause video driver to fail upon exit; Fix by Drake Arconis (Alchemy Viewer) 2017-11-25 16:58:52 +01:00
Ansariel f1c76a376c STORM-2151: Respect "Hide cursor while typing" user setting on Windows 2017-10-16 10:41:45 +02:00
Ansariel b641591983 Merge Firestorm LGPL 2017-10-02 18:05:03 +02:00
Ansariel 70d4585584 Only query SPI_GETMOUSEVANISH system parameter only if the setting changes instead of every keypress 2017-09-14 00:48:59 +02:00
Ansariel 008a370f76 LOLTYPO... ugh 2017-09-13 20:09:51 +02:00
Ansariel 80d5c638ce Respect "Hide pointer while typing" Windows preference setting 2017-09-13 20:08:40 +02:00
Ansariel e6f9a5e2db Merge viewer64 2017-07-27 21:07:14 +02:00
Nicky c4d7f25bac Merge with phoenix-firestorm-lgpl. 2017-05-23 14:09:46 +02:00
Nat Goodspeed fe64db61d6 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-05-22 21:30:26 -04:00
Nicky 4df25505e4 Merge 2017-05-18 17:10:31 +02:00
Ansariel 95fcf065c1 Merge viewer-bear 2017-04-19 21:43:58 +02:00
mnikolenko c27dbc6214 MAINT-6404 FIXED When pasting text with mac linebreak into a notecard, it shouldn't be removed 2017-04-03 02:21:18 +03:00
Callum Prentice 6d4c737b78 Additional work on : Fix for MAINT-7054 Viewer Crashed when I used Japanese IM. (Drake and Appurist convinced me my initial solution was non-optimal) 2017-03-27 16:20:51 -07:00
Callum Prentice 09003cf405 Fix for MAINT-7054 Viewer Crashed when I used Japanese IM. 2017-03-27 10:59:19 -07:00
Nicky c3791746d2 Merge #5 with lgpl. 2017-02-06 12:19:02 +01:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Ansariel e2919977d6 Merge viewer-lynx 2016-11-30 11:15:04 +01:00
Ansariel 7d8bfcfb74 Don't resize viewer window if UI scaling didn't change 2016-11-25 17:28:48 +01:00
Ansariel 07f24a3d3d FIRE-20416: Option to enable automatic UI scaling 2016-11-25 15:49:27 +01:00
Ansariel Hiller 76b3efe01c MAINT-6953 [Contribution] Error in DPI scaling calculation 2016-11-19 11:19:01 +00:00
Ansariel 12f0dd7c60 Fix DPI scaling calculation 2016-11-19 12:05:40 +01:00
Nat Goodspeed 934b94e74a DRTVWR-418: pull in new viewer-release via viewer64 2016-11-16 10:56:05 -05:00
Ansariel 92f6d8d521 Merge viewer-bear 2016-10-01 17:03:57 +02:00
Ansariel 2cd7b679db Merge Firestorm LGPL 2016-10-01 16:24:43 +02:00
Ansariel b65fe10749 Stop flashing the taskbar icon on Windows if the viewer gains focus; also fix an edge case where it sometimes wouldn't flash 2016-09-26 17:00:42 +02:00
Ansariel bb7cbe7cff Small improvements to UI DPI scaling on Windows:
* Use USER_DEFAULT_SCREEN_DPI define from WinUser.h
* Change Win32 SDK target version to Windows Vista or greater
* Define WM_DPICHANGED as preprocessor definition as in WinUser.h
* Cull manual definitions of WM_MOUSEWHEEL and WHEEL_DELTA which are part of the Win32 SDK since Windows NT 4.0
2016-09-20 21:16:39 +02:00
Ansariel 89fcc2f553 Minor improvements to UI scaling 2016-08-21 12:46:15 +02:00
Ansariel 4da402dd23 Merge viewer-bear 2016-08-21 12:39:18 +02:00
Ansariel c48bf0a156 Backed out changeset: 79b4f86861fb 2016-08-21 03:31:26 +02:00
AndreyL ProductEngine ea4b5e60d9 Fixed line endings in llwindowwin32.cpp 2016-08-20 14:28:03 +03:00
pavelkproductengine cf93c1c81d MAINT-5992 Second Life unusable on Windows 10 with 4k monitor SL forcibly overrides DPI compatibility option 2016-08-18 19:43:48 +03:00
Ansariel 842b2a6791 More fixing to the system UI scaling detection:
* Pass the screen coordinates of the viewer window to getSystemUISize and default to MONITOR_DEFAULTTONEAREST so we get the scaling of the monitor the viewer is running on
* Free shcore.dll as soon as we're done
2016-07-28 00:07:55 +02:00
Ansariel b9fa2329d2 Set DPI awareness via manifest as per https://msdn.microsoft.com/en-US/library/windows/desktop/dn302122(v=vs.85).aspx and also get the scaling from the primary display, assuming the viewer will open there and which might not be the display nearest to screen coordinate 1/1 2016-07-27 22:53:49 +02:00
Ansariel 594b760c52 Type fix 2016-07-26 19:56:16 +02:00
Ansariel 9153b343f2 Merge viewer-bear 2016-07-26 19:55:17 +02:00
pavelkproductengine 070116f212 MAINT-6493 SL Viewer does not respect the Windows 10 display setting size slider 2016-07-13 20:28:29 +03:00
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Ansariel 2d85844a3a FIRE-18245: Taskbar icon only flashes if window is minimized, not if unfocused 2016-05-04 10:42:05 +02:00
Nicky 30dcad4b95 Windows: 1. GWL_USERDATA must be GWLP_USERDATA to be compatible with x86 and x64. (GWL_USERDATA is deprecated anyway). 3. Replace Get/SetWindowLong with Get/SetWindoeLongPtr or placing this into GWLP_USERDATA will truncate the pointer.
(transplanted from 5f50745bff03700d3862a6bb1eb5936be0fdc6cd)
2016-04-22 14:55:19 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05: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
Todd Stinson 11b6e272ab PATH-743: Altering the mouse cursor to give more feed back when in path testing mode. 2012-06-21 16:39:35 -07:00
Dave Parks 99dc246ac8 Merge 2012-06-15 14:29:46 -05:00
Tank_Master 8cb09ca444 Merge to FS LGPL 29865 2012-08-30 15:45:02 -07:00
Tank_Master cb24ec2e0d merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
Tank@test_master.ftrdhcpuser.net 01c7d1eafb Merge LL pathfinding
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Nat Goodspeed 78f2663c4a Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:04:55 -04:00
Todd Stinson 6aeb2c68b9 Refining the behavior of the pathing test tool behavior with regards to mouse clicks. 2012-04-11 13:20:54 -07:00
Todd Stinson 2115211328 Re-implementing the path testing functionality as a proper LLTool. 2012-04-09 18:53:52 -07:00
Dave Parks 76eeeadeaa MAINT-771 Add RenderAutoHideSurfaceAreaLimit debug setting for protecting against sculpt based crashers. 2012-03-19 15:31:10 -05:00
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
Ansariel c5894c2781 Merge with Firestorm LGPL 2012-06-08 22:43:34 +02:00
Nicky 8e0bc37f42 When setting window size, don't add hardcoded chrome values 16/38 when running under win32. Instead calculate those values dynamically. 2012-06-08 20:56:52 +02:00
Tank_Master 1c55d5cbb6 Merge LL 3.3.2 release 2012-05-28 17:02:11 -07:00
Richard Linden 8024727d45 EXP-1832 WIP Viewer Size not persistent across logins
fixed not unmaximizing properly on Windows
put in error logging on Mac
2012-02-27 11:26:08 -08:00
Vadim ProductEngine 4e24022b8c EXP-1305 FIXED Prevent avatar from walking after double-clicking the title bar. 2012-02-27 15:54:41 +02:00
Richard Linden 9da67fff0a EXP-1832 FIX Viewer Size not persistent across logins
made Set Window Size correctly set interior window rect, preserving measured dimensions
2012-02-23 12:39:32 -08:00
Nat Goodspeed 0249a0d1e7 Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:07:09 -04:00
Dave Parks 002c9b3f3d MAINT-516 Potential fix for crash on startup in LLWindowWin32::switchContext 2012-04-11 16:02:24 -05:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Richard Linden 4c333d64ca EXP-1832 FIX Viewer Size not persistent across logins
Save *window* width and height, not client area
2012-02-16 15:45:43 -08:00
Vadim ProductEngine 12b4862330 EXP-1832 FIXED Viewer Size not persistent across logins.
Symptoms: Viewer window shrank by a few pixels on each startup.
Reason:   We used client rect (which did not include the window border) to create the viewer window.
Solution: Convert client rect into window rect, i.e. expand it by the border size.
2012-02-13 19:57:35 +02:00
Richard Linden f27ea1aff7 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
2012-02-07 22:50:49 -08:00
Richard Linden 4e08461f8a EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
changed over to new convert() method
added LLCoordFloater
2012-02-07 19:29:10 -08:00
Richard Linden d56be1f175 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
callum 987463d924 EXP-1765 POSSIBLE_FIX crash on startup at LLWindowWin32::switchContext(...) 2012-01-27 13:18:27 -08:00
merov 86ef722e7c EXP-1775 : cleanup a bit PeekMessage() usage, avoid eating one event when reaching MAX_MESSAGE_PER_UPDATE. 2012-01-13 15:11:37 -08:00
Nicky 52fc943c6d Merge up to 26312 / 0010858de5a1 (V/dev tip). 2012-01-27 18:29:47 +01:00
callum 9cdfecd9e1 EXP-1765 (Add debug info) crash on startup at LLWindowWin32::switchContext() 2012-01-10 10:40:27 -08:00
Richard Linden dd9263d017 Automated merge with http://hg.secondlife.com/viewer-development 2011-12-08 11:02:00 -08:00
Nicky 6ef7838cd2 Merge up to 25972:7fceba778ee6 (V/Dev) 2012-01-17 21:15:06 +01:00
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Ansariel 1e2d424f9e STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item 2011-12-05 23:35:29 +01:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Richard Linden 20221c8e77 EXP-1485 FIX -- Viewer should have a minimum size
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
callum e4e4977f5e EXP-1527 FIX Debug values for windowwidth and windowheight can be set below minimum required values
and
EXP-1528 Launching viewer with a settings.xml file with windowwidth and windowheight set below minimum values, launches to those values not minimum window size
2011-11-11 12:29:04 -08:00
Oz Linden 6b516b7a6c merge changes for vmrg-182 2011-11-08 15:59:50 -05:00
Dave Parks fa5a0a90f4 SH-2240 Fix for core profile assertions when Debug GL enabled. 2011-11-03 15:00:40 -05:00
Leslie Linden f6e3d0e581 EXP-1486 FIX -- Minimum window size on windows
Reviewed by Callum.
2011-10-31 13:27:25 -07:00
Dave Parks bc65e929fc SH-2240 Fix for heap corruption under debugger when starting viewer with basic shaders disabled. 2011-10-31 11:29:32 -05:00
Brad Payne (Vir Linden) 51c7887f8d merge 2011-10-31 11:35:22 -04:00
Xiaohong Bao 0cc30aec0f some debug code for SH-2391: [crashhunters] pre-login crash at LLViewerWindow::LLViewerWindow 2011-10-24 22:28:57 -06:00
Dave Parks 967479f903 SH-2031 Fix for stall in image update -- don't use the CPU to convert a height map into a normal map -- use the GPU instead via a shader. Also, WTF glFinish? 2011-10-05 15:12:02 -05:00
Dave Parks bd02cdc75f merge 2011-09-26 19:27:10 -05:00
Dave Parks a2d08a6d80 SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and modify viewer to run under said context without generating errors. 2011-09-22 00:10:57 -05:00
Dave Parks 66acb932ba SH-2244 Add "RenderGLCoreProfile" debug setting that allows the viewer to start with a non-compatibility-profile OpenGL context. 2011-09-20 03:34:09 -05:00
Brad Payne (Vir Linden) ff60546070 merge 2011-08-22 13:16:02 -04:00
Xiaohong Bao 13e152c92d fix for SH-2177: Second Life Crashes On Startup in Advanced Mode -- I have reinstalled SL, Clear Caches -- Nothing Works 2011-08-03 14:54:53 -06:00
Nyx (Neal Orman) 8f94ff85f9 merging up latest mesh-development to nyx-mesh-development 2011-05-17 12:13:54 -04:00
Oz Linden e0adaa188b fix dos line endings 2011-04-09 22:49:10 -04:00
Andrew A. de Laix 7cc0388d81 FIX VWR-25444: properly initialize DEVMODE structure to prevent crash. 2011-04-06 14:55:09 -07:00
Nyx (Neal Orman) d1683bd65a glFlush != glFinish. doh. 2011-01-13 13:46:00 -05:00
Nyx (Neal Orman) 8fae5d49bf testing: adding glFlush() each frame for performance testing 2011-01-07 18:24:35 -05:00
Ansariel 0a14d57cdb FIRE-3798/STORM-1713: Linden Lab approved version of the fix for mouse cursor flickering when hovered over inworld objects 2011-12-08 18:20:08 +01:00
Ansariel bae42f3918 Perfomance fix: Don't call glFinish because it kills parallelism; Originally found by Shyotl Kuhr (Singularity) 2011-11-01 23:18:04 +01:00
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
Xiaohong Bao cef8b71fa6 fix for SH-2177: Second Life Crashes On Startup in Advanced Mode -- I have reinstalled SL, Clear Caches -- Nothing Works 2011-08-03 14:54:53 -06:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Tozh f4e30cccd8 Added avatar full name to the window header - base and Windows platform (still needs Mac and Linux) 2011-03-20 12:22:57 -04:00
JessicaLyon 06eeb3fffb Completed, added open capabilities to chat logs, crash logs, cache and settings file locations. 2011-02-10 16:42:12 -05:00
kadah a7e724e6c6 Less intrustive code for legacy cursor support 2011-01-18 17:27:11 -08:00
kadah 80e2a367a3 Added support for legacy cursors 2011-01-15 20:07:08 -08:00
callum 95ecad54c6 EXP-112 Enable fullscreen mode (with mode switch, not resize to desktop) as per 1.x viewer. 2010-09-28 16:52:56 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Yuri Chebotarev 2479959dd9 additional fix for EXT-4858 Normal "Detecting Hardware..." not showing correctly in non-English languages with Viewer 2.0
reviewed Mike Antipov
EXT-4858 "Detecting Hardware..." not showing correctly in non-English languages with Viewer 2.0

--HG--
branch : product-engine
2010-04-30 17:42:25 +03:00
Yuri Chebotarev 3d13402419 fix EXT-4858 "Detecting Hardware..." not showing correctly in non-English languages with Viewer 2.0
reviewed Vadim Savchuk
https://codereview.productengine.com/secondlife/r/317/

--HG--
branch : product-engine
2010-04-27 19:28:42 +03:00
Tofu Linden 10905a7ed1 merge from viewer-hotfix 2010-04-15 10:22:42 +01:00
Richard Nelson fcb36144dd accidentally changed default cursor for testing purposes, reverted 2010-04-14 20:17:44 -07:00
Richard Nelson bd2b97fe40 EXT-2418 and EXT-6317
found out how to fix loading 32-bit cursors from embedded resource and moved them back there instead of freestanding files
2010-04-14 20:06:06 -07:00
Tofu Linden 8dd6286309 merge from viewer-hotfix 2010-04-14 09:47:58 +01:00
Richard Linden 7e210d185f fix for EXT-6317 and EXT-2418 regressions in installed viewers
new 32-bit mouse cursors were not getting packaged by installer for windows builds

reviewed by Monroe
2010-04-13 18:07:24 -07:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
Richard Nelson e50586043b EXT-3258 - Viewer freezes while external web browser loads page
reviewed by Callum
2010-03-29 15:28:48 -07:00
Igor Borovkov 11e4b42ec9 merge
--HG--
branch : product-engine
2010-03-18 16:38:44 +02:00
Igor Borovkov c67bc96278 Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on first-run)
by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux."

--HG--
branch : product-engine
2010-03-18 16:31:09 +02:00
Richard Linden f6754b9fd0 improved mouse cursors (32-bit) 2010-03-09 19:12:43 -08:00
Richard Linden e5c4438fd7 merge 2010-03-09 13:27:26 -08:00
Richard Linden dcf279d663 EXT-2418 added open/sit/buy mouse cursors 2010-03-05 18:34:36 -08:00
Eugene Mutavchi 48fd4c8d14 Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux.
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
Monroe Linden 3699be5c45 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-02-05 18:38:16 -08:00
Monroe Linden 8b0ae67e73 Changed LLWindowWin32::getNativeKeyData() to use platform-specific names in the key data.
Changed MediaPluginWebkit::deserializeKeyboardData() to use platform-specific names when extracting the key data.  Also fixed a mac-specific issue where the arguments were reversed, which was causing flash apps to get bad keycode data.

Just pass 0 for the "native modifiers" param on windows, since it doesn't seem to actually have a native notion of a "modifier keys mask".  The Qt (non-native) modifiers should be good enough.
2010-02-05 18:23:16 -08:00
Callum Prentice 80139d95ad added code to grab raw key codes from Win32 WPARAM and LPARAM and send to plugin
factored out keyboard message deserialization for media_plugin_webkit
new version of llqtwebkit with Girish's changes to keyboard and cursor handling code
2010-02-04 16:30:21 -08:00
Rick Pasetto 9430b8de65 dos2unix these files 2010-02-01 16:29:52 -08:00
Rick Pasetto e31d695247 get rid of commented-out code 2010-01-08 15:11:15 -08:00
Rick Pasetto 8944bc36ed Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-08 14:12:15 -08:00
richard 9e0e4153ca EXT-3994 - Mouse wheel zoom on 2nd monitor unexpectedly works if pointer...
reviewed by Mani
2010-01-07 13:49:55 -08:00
Rick Pasetto 4a92f49e7b Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0 2009-12-10 09:28:47 -08:00
James Cook 7ff7709f9f Expose window minimize and restore in LLWindow interface.
Add secondlife:///app/login/reg handler for Reg-In-Client
Reviewed with Ambroff
2009-12-04 17:33:36 -08:00
Rick Pasetto 4c33c54ce0 Fix windows build to now use DragNDropAction instead of a bool 'drop' 2009-12-03 19:02:12 -08:00
Rick Pasetto ff53d4ff9b Fix Windows build based on API change to handleDragNDrop() 2009-12-03 12:19:02 -08:00
callum e2e7d544b6 Added support for dropping SURLs onto viewer
Does right thing when logged in - needs some work at login page
Removed (commented out) WM_DROPFILES code for now
2009-11-24 20:20:53 -08:00
Rick Pasetto bf5ce0fcbd Change 'handleDrop()' API to 'handleDragNDrop', which now takes a "drop" BOOL 2009-11-12 11:06:29 -08:00
callum caa631bf5b Added IDropTarget interface. Still lots of cleanup but this works ok.
You can drag over from Firefox or IE onto a prim
2009-10-27 17:52:04 -07:00
Rick Pasetto eba6d0236f Backed out changeset: 57dc52edbbc9 2009-10-21 16:01:52 -07:00
Rick Pasetto 7135537435 Backed out changeset 60da2fc952a0 2009-10-21 11:15:46 -07:00
callum 2528d3a75f Test code to allow drag/drop of *file* (not URLs) into the viewer Window - Will not be pushed to main repository - only committed so I can bundle my changes and share 2009-10-21 11:01:11 -07:00
James Cook 750f94ca69 EXT-1141 Remove one-click cursor icons from art directories. Cursor is now a hand for all one-click actions, at Erica's request. Deleted art files for Win/Mac/Linux, including repackaging the SDL binary download package. Reviewed with Kelly. 2009-10-07 00:15:11 +00:00