9bee2a92d2
SL-17997 Follow up from beta breakers results.
2022-08-26 10:51:42 -05:00
a02f621700
SL-17005: Clean up debug code
2022-08-18 16:29:52 -07:00
e9e62b798d
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-08-17 19:31:17 +02:00
aa5c4d45aa
SL-17719 Windows support for absolute mouse positioning #2
...
Better touch screen handling
2022-08-16 00:09:50 +03:00
ff895e96b2
SL-17719 Windows support for absolute mouse positioning
...
For virtual machines and touch screens
Also raw input is not subjected to mouse speed
2022-08-14 21:14:39 +03:00
c790bf7f49
SL-17005: (WIP) (Debug) Add logging and debug settings to assist in understanding Windows 8 failure modes. Most of this should be removed later
2022-08-11 11:10:25 -07:00
eac4540fc3
SL-17005: (WIP) (DEBUG) Add logging for graphics adapters
2022-08-09 15:09:14 -07:00
47ee4aff47
SL-17005: Fix crash in initDX when no factory
2022-08-09 11:51:33 -07:00
ffb75050fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-02 15:27:10 +02:00
e8f4153fc2
Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
2022-06-30 18:59:34 +02:00
adfc89c831
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 23:08:37 +02:00
069304ca39
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
...
# Conflicts:
# autobuild.xml
# indra/llrender/llgl.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llvovolume.cpp
2022-06-29 21:23:23 +03:00
b0e9840648
Merge branch 'master' into DRTVWR-539
2022-06-29 21:03:15 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
3a4a0bd3d2
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-06-29 17:25:32 +02:00
8ac67e5476
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
2022-06-18 15:53:35 +02:00
87c38379e1
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-06-10 12:32:42 +02:00
da069765b1
SL-17005 Tweak target VRAM usage and add some log spam to help zero in on good targets.
2022-06-08 16:24:03 -05:00
ba9bff5b9b
SL-17541 Show the message that user is currently at maximum FPS
2022-06-08 01:21:42 +03:00
c5d9c3c2a7
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Tracy.cmake
# indra/llcommon/llprofiler.h
# indra/llcommon/llqueuedthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llimagej2coj/llimagej2coj.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
2022-06-03 15:07:06 +02:00
ff65e23f20
SL-17515 FIXED Extreme Mouse Sensitivity for Certain Actions
2022-06-03 14:08:04 +03:00
e60b6e45e4
Manually apply fix for SL-17474 Device context not properly released at shutdown
2022-05-30 19:19:32 +02:00
ce0286c33b
SL-17474 Device context not properly released at shutdown
2022-05-30 15:02:03 +03:00
3765c775cb
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-05-21 15:04:54 +02:00
6eaf8521ab
SL-17287 Instrument and optimize cubemap render. Fix for cubemap snapshots doing a full resolution render instead of a 512x512 render.
2022-05-20 19:05:28 -05:00
6c6d9a10f8
SL-17287 Update Tracy to 0.8.1. Clean up GPU instrumentation.
2022-05-20 13:31:18 -05:00
c0aa1a1202
SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219
...
Update task branch from main project branch.
2022-05-18 14:08:24 -04:00
410704b5c6
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-03 11:37:50 +02:00
da6f4204b7
SL-17124 make sure window thread wakes up to proces 'quit' message
2022-04-29 22:18:20 +03:00
904b16a0a7
SL-17124 switchContext and loadShaderFile crashes
...
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
a775b9fc7f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-04-19 15:49:47 +02:00
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
425b071c64
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into SL-17005
2022-03-29 15:41:34 -05:00
e60024f0af
SL-17005 WIP - Use D3D/DXGI to query for available VRAM on Windows
2022-03-29 15:41:00 -05:00
e76a3b12e6
SL-17074 fix ALT-F4 handling without impacting alt-zoom
2022-03-29 11:36:28 -06:00
578087b7bd
SL-17074 Fix Alt-F4 handling bug
2022-03-24 11:21:25 -06:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
8c2deb6f8d
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/lltracker.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
2022-02-22 14:52:56 +01:00
0d6aa3c0fe
SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and querying for available video memory.
2022-02-17 22:52:23 +00:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
8c823b75c0
SL-16606: Add profiler category WIN32
2022-01-14 11:50:22 -08:00
265bca5d63
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-13 21:18:22 +01:00
3ac21ebbf6
SL-16454 FIXED Performance viewer login screen is black
2021-12-17 13:07:23 +02:00
d06070241a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llvovolume.cpp
2021-12-16 10:09:12 +01:00
47e2173239
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2021-12-16 08:42:54 +01:00
c21dad8207
SL-16467 FIXED "Keyboard layout" is not switched
2021-12-13 12:14:14 +02:00
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
Dave Parks