5b89548761
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-23 12:14:36 +02:00
a1c215aa20
SL-13733 Crash: Do not unassign event handler before handling WM_DESTROY
2020-09-18 22:30:39 +03:00
240757c0d0
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-20 16:52:04 +02:00
78a79267e8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-19 09:30:26 +02:00
4e94745139
Merge branch 'master' 6.4.8 into DRTVWR-510
2020-08-18 10:22:40 -06:00
cfe0ba9035
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llimprocessing.cpp
2020-08-18 19:16:03 +03:00
4b1a0e51b0
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# indra/newview/llimprocessing.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewermenufile.cpp
2020-08-18 19:15:26 +03:00
44906ac0d4
SL-13507 Viewer should log resolution of all associated displays
2020-07-17 20:28:02 +03:00
69b005b149
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-15 16:41:49 +02:00
201384690c
SL-5894 Fix llurlentry test building
2020-07-15 16:02:51 +03:00
8c66f54cfa
SL-5894 #4 Organize device storage between sessions
2020-07-15 13:55:32 +03:00
54383cac8f
SL-5894 #3 WIP enumerate devices to flaoter, let floater set device
...
temp
2020-07-15 13:55:32 +03:00
df986a402a
SL-5894 Changed joystick init to select device with apropriate manufacturer and type
2020-07-10 14:12:07 +03:00
5cb11c6214
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-01 16:00:06 +02:00
d9a03b55ff
SL-12085 Way to debug window message processing with logcontrol
2020-06-30 23:53:48 +03:00
7c55fc0401
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-17 14:22:00 +02:00
d202f460e2
SL-12085 Debug log for show() and PeekMessage
...
User's viewer freezes right after setStartupState( STATE_LOGIN_CLEANUP ) and these places are primary suspects
2020-06-17 00:08:25 +03:00
6f06ccc10a
SL-12085 Debug-log window position
2020-06-15 20:22:39 +03:00
3313f382bd
SL-12971: Add logging of Display Devices -- useful on dual GPU machines
2020-05-04 12:11:57 -06:00
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
d246062116
SL-12170 Somehow crash still happens inside __try block
2019-10-22 16:21:40 +03:00
e8b426d1c2
Merge viewer-neko
2019-09-11 17:34:55 +02:00
98b28e5881
SL-11910 [Win] Horizontal scroll
2019-09-10 19:49:15 +03:00
cdcdc4b3e3
Merged in lindenlab/viewer-bear
2019-08-13 21:59:37 +03:00
ef423bfb81
Merged in lindenlab/viewer-release
2019-08-13 21:54:23 +03:00
529569cdd9
Merge viewer-neko
2019-08-04 12:09:33 +02:00
a0bf70b41d
SL-11592 [Mac] Ability to bind extra mouse buttons for push to talk
2019-07-18 19:18:02 +03:00
ba2429163a
SL-11592 [Win] Ability to bind extra mouse buttons for push to talk
2019-07-18 18:37:45 +03:00
293d186190
Merged in lindenlab/viewer-release
2019-06-24 20:10:14 +03:00
25d83975f4
Merge Firestorm LGPL
2019-06-22 20:54:01 +02:00
13580377c4
Merged in lindenlab/viewer-release
2019-06-22 03:16:39 +03:00
e0ca19d8ab
Merge LL viewer-release 6.2.3
2019-06-20 23:14:11 +02:00
9212c1f33e
SL-11341 Skip storing the previous gamma value on Intel GPUs + more logging
2019-06-04 00:03:03 +03:00
7cef93c267
Merge Firestorm LGPL
2019-04-15 11:34:13 +02:00
19cae5d2cc
SL-10907 getWidthF32 crash in fonts
2019-04-08 18:53:47 +03:00
b0a483bea3
SL-10907 getWidthF32 crash in fonts
2019-04-08 18:53:47 +03:00
3adc5c2b50
Merge viewer-neko
2019-03-26 19:15:36 +01:00
ec9a70de94
SL-10648 Handling for Window crash on exit
2019-03-21 18:58:11 +02:00
146792d98d
Merge Firestorm LGPL
2019-02-17 11:44:08 +01:00
6308743fd2
Fix issue where gamma was being corrupted on windows with night light enabled
2019-02-08 19:26:28 -08:00
562a0d9d0a
FIRE-23498: Tray icon flash still functions randomly - hopefully more fixes
2019-01-13 17:19:43 +01:00
8a66dd570c
FIRE-23498: Tray icon flash functions randomly
2019-01-12 12:17:18 +01:00
8b6392c0aa
Merge viewer-bugsplat
2018-12-16 13:04:08 +01:00
02b9ac8d9a
SL-10153: Fix OSMessageBoxWin32() to handle non-ASCII text.
2018-12-11 20:51:51 -05:00
d93b92ec1d
Merge viewer-bear
2018-09-12 20:13:12 +02:00
94eeef729e
MAINT-9082 crash on HandleFocusLost
2018-09-04 20:19:48 +03:00
1f02cfc1de
Merge viewer-neko
2018-08-16 14:51:06 +02:00
9f16d10f6d
MAINT-5651 Crashes on close from LLWindowWin32
2018-08-14 18:32:59 +03:00
5d3ba25bf2
Merge viewer-neko
2018-06-01 20:27:39 +02:00
18bb3f6b86
MAINT-8712 Crash on close in LLWindowWin32
2018-06-01 13:51:03 +00:00
c4e18fbcaa
Merge viewer-neko
2018-02-27 18:08:48 +01:00
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
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
3b73cec39e
Build fix for non-dpi aware environment
2018-01-19 19:42:57 +02:00
af3bf74eea
MAINT-8183 Additional logging
2018-01-17 18:46:56 +02:00
f6e3684f6e
Merge Firestorm LGPL
2018-01-17 12:07:54 +01:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
c9e417c8a6
Merge viewer-neko
2017-11-30 01:19:29 +01:00
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
f1c76a376c
STORM-2151: Respect "Hide cursor while typing" user setting on Windows
2017-10-16 10:41:45 +02:00
b641591983
Merge Firestorm LGPL
2017-10-02 18:05:03 +02:00
70d4585584
Only query SPI_GETMOUSEVANISH system parameter only if the setting changes instead of every keypress
2017-09-14 00:48:59 +02:00
008a370f76
LOLTYPO... ugh
2017-09-13 20:09:51 +02:00
80d5c638ce
Respect "Hide pointer while typing" Windows preference setting
2017-09-13 20:08:40 +02:00
e6f9a5e2db
Merge viewer64
2017-07-27 21:07:14 +02:00
c4d7f25bac
Merge with phoenix-firestorm-lgpl.
2017-05-23 14:09:46 +02:00
fe64db61d6
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-05-22 21:30:26 -04:00
4df25505e4
Merge
2017-05-18 17:10:31 +02:00
95fcf065c1
Merge viewer-bear
2017-04-19 21:43:58 +02:00
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
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
09003cf405
Fix for MAINT-7054 Viewer Crashed when I used Japanese IM.
2017-03-27 10:59:19 -07:00
c3791746d2
Merge #5 with lgpl.
2017-02-06 12:19:02 +01:00
434f0e161a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-02-03 09:54:52 -05:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
e2919977d6
Merge viewer-lynx
2016-11-30 11:15:04 +01:00
7d8bfcfb74
Don't resize viewer window if UI scaling didn't change
2016-11-25 17:28:48 +01:00
07f24a3d3d
FIRE-20416: Option to enable automatic UI scaling
2016-11-25 15:49:27 +01:00
76b3efe01c
MAINT-6953 [Contribution] Error in DPI scaling calculation
2016-11-19 11:19:01 +00:00
12f0dd7c60
Fix DPI scaling calculation
2016-11-19 12:05:40 +01:00
934b94e74a
DRTVWR-418: pull in new viewer-release via viewer64
2016-11-16 10:56:05 -05:00
92f6d8d521
Merge viewer-bear
2016-10-01 17:03:57 +02:00
2cd7b679db
Merge Firestorm LGPL
2016-10-01 16:24:43 +02:00
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
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
89fcc2f553
Minor improvements to UI scaling
2016-08-21 12:46:15 +02:00
4da402dd23
Merge viewer-bear
2016-08-21 12:39:18 +02:00
c48bf0a156
Backed out changeset: 79b4f86861fb
2016-08-21 03:31:26 +02:00
ea4b5e60d9
Fixed line endings in llwindowwin32.cpp
2016-08-20 14:28:03 +03:00
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
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
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
594b760c52
Type fix
2016-07-26 19:56:16 +02:00
9153b343f2
Merge viewer-bear
2016-07-26 19:55:17 +02:00
070116f212
MAINT-6493 SL Viewer does not respect the Windows 10 display setting size slider
2016-07-13 20:28:29 +03:00
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
2d85844a3a
FIRE-18245: Taskbar icon only flashes if window is minimized, not if unfocused
2016-05-04 10:42:05 +02:00
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
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
46d5cd7f24
Merge with https://bitbucket.org/callum_linden/viewer-cef
2015-09-03 14:38:13 +02:00
1db2c7276d
Merge with viewer-release
2015-08-31 11:17:28 -07:00
286430cf15
Unsafe Win64 code fix by Drake Arconis
2015-07-17 11:56:21 +02:00
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
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
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
4d840e00a2
Backup f9628f6e4492 (temporary fix for FIRE-15529) - LL fix is coming next
2015-04-17 00:57:24 +02:00
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
a1fd8230bf
Merge LL V3.7.12
2015-01-12 17:56:50 +01:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
a755c04c29
Make OSMessageBoxWin32 displays proper extended characters.
2014-10-01 17:12:55 +02:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
592b7e2fdf
MAINT-4009: Correcting a pointer deletion that should have correctly been an array deletion.
2014-04-24 00:35:14 +01:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
97a45e7597
Cleaning up legacy cursors and adding merge guard comments on changed code
2014-05-19 16:54:18 -07:00
ee88720b8a
Backed out changeset: ec54b058227c
2014-05-18 20:02:31 -07:00
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
02423199e8
Automated merge with https://bitbucket.org/lindenlab/viewer-lion
2014-03-11 17:42:02 -05:00
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
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
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
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
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
1c5659b1ca
CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0
2013-04-25 20:02:36 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
ed4c40a7ab
Merge with -lgpl
2013-10-14 20:57:33 +02:00
329ca38457
Merge with -lgpl.
2013-09-14 23:23:26 +02:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
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
0addf213ed
Merge with FS tip. First pass.
2013-08-02 00:40:48 +02:00
bdee194522
Fix some easy little pointer confusions for 64 bit versions.
2013-08-01 23:52:49 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
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
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
bf1c1947d7
PATH-743: Updating the cursors for path testing mode to final designs.
2012-06-25 14:28:21 -07:00
6e710333e7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-06-22 18:59:31 -07:00
Ansariel