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
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
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
99dc246ac8
Merge
2012-06-15 14:29:46 -05:00
8cb09ca444
Merge to FS LGPL 29865
2012-08-30 15:45:02 -07:00
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
01c7d1eafb
Merge LL pathfinding
...
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
78f2663c4a
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:04:55 -04:00
6aeb2c68b9
Refining the behavior of the pathing test tool behavior with regards to mouse clicks.
2012-04-11 13:20:54 -07:00
2115211328
Re-implementing the path testing functionality as a proper LLTool.
2012-04-09 18:53:52 -07:00
76eeeadeaa
MAINT-771 Add RenderAutoHideSurfaceAreaLimit debug setting for protecting against sculpt based crashers.
2012-03-19 15:31:10 -05:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
c5894c2781
Merge with Firestorm LGPL
2012-06-08 22:43:34 +02:00
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
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
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
4e24022b8c
EXP-1305 FIXED Prevent avatar from walking after double-clicking the title bar.
2012-02-27 15:54:41 +02:00
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
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04:00
Ansariel