7683477547
SL-16480 Followup -- fix for unintialized mRect/mClientRect and bad getClientRectInScreenSpace
2021-12-09 16:44:44 -06:00
9689e606f4
SL-16480 Fix for window not saving its position on exit.
2021-12-09 14:01:41 -06:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
4a1ef323ae
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-29 19:40:28 +01:00
0b066539fe
DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.
...
Reverting a merge is sticky: it tells git you never want to see that branch
again. Merging the DRTVWR-546 branch, which contained the revert, into the
glthread branch undid much of the development work on that branch. To restore
it we must revert the revert.
This reverts commit 029b41c041
2021-11-24 10:47:54 -05:00
d71e0a6d47
SL-16094, SL-16400: Merge branch 'DRTVWR-546' into glthread
2021-11-23 21:23:45 -05:00
67ace0df99
SL-16400: Address a couple shutdown crashes.
...
It can happen that we try to post() work for LLWindowWin32's window thread
after the thread's WorkQueue has been closed.
Also, instead of giving the "General" ThreadPool static lifespan, put it on
the heap, anchored with a static unique_ptr.
2021-11-23 20:48:44 -05:00
2b96f89c2a
SL-16400: Add ThreadPool::start() method, and call it.
...
It's sometimes important to finish other initialization before launching the
threads in the ThreadPool, so make that an explicit step. In particular, we
were launching the LLImageGL texture thread before initializing the GL
context, resulting in all gray textures.
2021-11-23 20:39:32 -05:00
6d36038e40
Merge branch 'glthread' of ssh://bitbucket.org/lindenlab/viewer into glthreadx
2021-11-23 15:41:46 -05:00
37900e593d
SL-16094: Fix second startup hang.
...
Add LLWindowWin32Thread::Post(), like post() except it uses PostMessage() to
send the work item to the window thread. Support this in mainWindowProc().
Move LLWindowWin32::recreateWindow()'s destroy_window_handler() call onto the
window thread. Delaying destruction of the old HWND ensures that we can use
PostMessage() and GetMessage() with that HWND to pass the lambda work item.
Moreover, it's likely to be less buggy to call DestroyWindow() on the same
thread that created the window.
Make recreateWindow()'s window thread lambda bind the window class parameters
by value, rather than binding 'this' and back-referencing LLWindowWin32
members.
Make recreateWindow() construct the window thread lambda and then decide
whether to pass it to the window thread using post() or Post(), depending on
whether we have a current HWND -- therefore whether the window thread is
blocked on GetMessage(). That means we can eliminate the kickWindowThread()
call.
Make destroy_window_handler() accept HWND by value rather than by non-const
reference. Since it doesn't attempt to modify the caller's value, this is a
better match for the function's semantics anyway -- but importantly, it lets
us pass a const HWND.
2021-11-23 15:40:36 -05:00
9b0d8c7e62
SL-16094 More profile hooks for threading code, remove redundant wglCreateContextAttribs call
2021-11-22 18:42:56 -06:00
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
a633efdc0b
SL-16094: In LLWindowWin32::recreateWindow(), kick window thread
...
before blocking on the pending future. Otherwise the window thread can remain
blocked in a GetMessage() call and deadlock the app.
2021-11-15 14:34:30 -05:00
74055d022f
Fix null pointer guard for wglSwapIntervalEXT
2021-11-15 17:58:45 +01:00
029b41c041
Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"
...
This reverts commit 5188a26a85819088563e
2021-11-15 09:25:35 -07:00
5dcac17109
Start probing with OGL version 4.6 again
2021-11-13 00:16:37 +01:00
790ead2ef2
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-541
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/lltracerecording.h
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2021-11-12 17:43:32 +01:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
1a39a8f7d9
Merge branch 'DRTVWR-546' into glthread
2021-11-10 10:28:58 -05:00
214d8d40c1
SL-16094: Statically link to Windows IMM32.LIB.
...
llwindowwin32.cpp's LLWinImm class used to dynamically load IMM32.DLL and
populate its methods using GetProcAddress(). That was to support Windows XP.
Since we've dropped Windows XP, use static linking instead, with dramatically
fewer lines of code (and less of a thread safety alarm trigger).
We retain the LLWinImm wrapper class only as a hook for Tracy instrumentation.
2021-11-10 10:17:12 -05:00
768b7a4d33
SL-16330 Clean up vertical sync handling, add to UI
2021-11-09 17:17:49 +02:00
08336bb469
SL-16094: Zap thread safety land mine; thin PostMessage() calls.
...
LLWindowWin32::mWndProc was a public WNDPROC member. If set non-NULL,
mainWindowProc() would call that before falling into its own handler code. But
now, mWndProc would be called on the window thread instead of on the main
thread. Running arbitrary callback code on the window thread could cause all
sorts of problems.
It could be made safe by posting the callback call to the "mainloop" WorkQueue
for execution on the main thread. But as no code actually references it,
delete it instead.
Per DaveP, the recent change to LLWindowsWin32Thread::post() could end up
calling PostMessage() many times per frame, with nontrivial overhead.
Reinstate the more selective code that calls PostMessage() with the dummy
message (to bust us out of GetMessage() to check pending window-thread work
requests) at most once per frame.
2021-11-08 15:15:56 -05:00
c7af4921db
SL-16094: Use ThreadPool for LLWindowWin32Thread.
...
Move the whole LLWindowWin32Thread class inside LLWindowWin32, and make it a
struct. Migrate the struct declaration to llwindowwin32.cpp.
Derive it from ThreadPool, which provides the WorkQueue. Use runPending()
instead of manually popping and running individual queue items.
Make its post() operation always PostMessage(bogus) whenever we put an entry
in the WorkQueue, so we won't remain blocked in GetMessage().
Instead of storing a back pointer to the LLWindowWin32 instance, store the
relevant HWND and HDC in LLWindowWin32Thread itself to avoid cross-thread
timing problems.
Extract both instances of a large duplicated block of LLWindowWin32 code to a
new recreateWindow() method, and call it in those places. Per the TODO, use a
std::future to pass the new HWND and HDC back to LLWindowWin32 -- but also
store them locally on the LLWindowWin32Thread instance.
2021-11-05 17:20:11 -04:00
b6afa7f7dd
SL-16288 FIXED Dragging a file across the viewer cancels the drag and freezes the File Explorer
2021-11-05 17:48:40 +02:00
68b75be652
SL-9436 Don't render 100% transparent objects.
2021-10-28 22:09:22 +00:00
02bc150a7f
Merge branch 'DRTVWR-541' of https://bitbucket.org/lindenlab/viewer
2021-10-28 12:47:09 +02:00
ba3459f77f
Merged DRTVWR-546 into SL-15999
2021-10-25 15:55:06 +00:00
e5cd9cb90f
merge
2021-10-22 18:11:48 +01:00
5553d61421
SL-16203 Fix for wonky handling of mouse deltas.
2021-10-22 17:01:33 +00:00
32f46e17d3
SL-16027: Fix SL-15962 breaking Tracy OpenGL. Can now log memory + OpenGL in Tracy at the same time.
2021-10-15 16:13:06 -07:00
cf80612b7d
Fix up memory/gpu profiling
...
Note that the memory profiling is incomplete.
only c++ new/delete annd aligned allocation is intercepted. On Linux/Mac, most aligned allocation will also be ignored.
The Linux paths in llmemopry.h should probably be rewritten to use more efficient APIs as well.
2021-10-12 10:19:57 +01:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
2148e4c731
SL-16094 Move LLWindowWin32::mainWindowProc and Windows message handling to a background thread to prevent frame stalls in LLWindowWin32::gatherInput
2021-10-01 15:51:12 +00:00
851fef6801
SL-16102 Set window title to agent name (child of SL-15999 Support for low overhead, non interactive viewer sessions)
2021-09-28 15:24:42 -07:00
9cff7ebc0c
Merge remote-tracking branch 'remotes/origin/DRTVWR-541' into DRTVWR-546
...
# Conflicts:
# indra/llcommon/linden_common.h
2021-09-22 16:50:20 -05:00
a35544c701
SL-16027: Add Tracy OpenGL support
2021-09-21 16:10:52 -07:00
014dd037dd
SL-16043 Fix DisableVerticalSync, default DisableVerticalSync to off, remove broken frame limiter code (use vsync if you want to limit framerate).
2021-09-20 21:22:17 +00:00
603e04ee3c
Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 13:18:55 +02:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
3a16a54452
SL-15359 out_of_range exception
2021-06-08 23:56:23 +03:00
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
c516f1fc9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:50:45 +02:00
58b4afa0ba
Merge branch 'master' into DRTVWR-530-maint
2021-04-30 03:05:06 +03:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
5cde118ec8
SL-14664 Added zoomout and sizeall
...
Remade code to use getCursorFromString
2021-04-27 23:08:54 +03:00
4f834d8224
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 21:01:07 +01:00
e4f0270887
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 11:41:48 +01:00
2da8ac774b
Avoid lock silliness
2021-02-05 20:29:21 +00:00
3ac4e2a4fc
SL-14705: Merge Sovereign Engineer's fix for name tags showing in front with AMD GPUs: Fix GL_INVALID_OPERATION when copying stencil to default window framebuffer on AMD graphics on windows
2021-02-03 09:06:02 +01:00
24e4b6867a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 15:00:04 +01:00
7458601374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 00:05:53 +01:00
f07b332ef0
Merge branch 'master' into DV525-merge-6.4.13
2021-02-01 15:59:08 -07:00
609a26b59a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
...
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
3b3dc83edc
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-26 09:34:58 +01:00
7b2dd98962
SL-14705: Cleanup U32 S32 cast
2021-01-25 15:55:22 -08:00
ef4c7c1247
SL-14705: Merge Sovereign Engineer's fix for name tags showing in front with AMD GPUs: Fix GL_INVALID_OPERATION when copying stencil to default window framebuffer on AMD graphics on windows
2021-01-25 15:52:58 -08:00
93f1998a47
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-01-08 23:06:41 +01:00
1a8800b051
SL-14347 Crash at ChoosePixelFormat
2021-01-04 16:48:46 +02:00
6c587d437d
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-02 08:17:58 +01:00
c549651028
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-12-02 08:09:26 +01:00
bb4d02446f
SL-14347 Crash at ChoosePixelFormat SEH
2020-12-01 18:22:24 +02:00
40b0af5b1c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-20 23:02:29 +01:00
a55ec70585
SL-14347 Crash at ChoosePixelFormat
2020-11-19 16:56:10 +00:00
0bba892bb0
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
2020-11-13 18:22:43 +02:00
1eee9a87f3
Only try destroying an existing window
2020-11-12 22:15:44 +01:00
daec926a54
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:02:25 +01:00
af2abe17cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 00:51:42 +01:00
21e2f3e974
Merge branch 'master' 6.4.12 into DRTVWR-510
2020-11-11 15:43:06 -07:00
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
af61974386
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-05 09:14:11 +01:00
b45eb585b6
SL-13733 Verify window handle
2020-10-20 22:25:23 +02:00
3ebf3b7182
SL-13733 Verify window handle
2020-10-20 18:43:51 +03:00
857c733acd
4.6 is current OpenGL specification - so start with probing that...
2020-10-18 02:21:58 +02:00
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
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
002c9b3f3d
MAINT-516 Potential fix for crash on startup in LLWindowWin32::switchContext
2012-04-11 16:02:24 -05:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
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
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
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
Runitai Linden