fe3be58938
SL-18721 Shutdown fixes #6
2024-03-01 18:20:01 +02:00
6d077c90a0
Merge branch 'main' into DRTVWR-588-maint-W
2024-03-01 17:30:06 +02:00
2e5b105dff
SL-18721 Shutdown fixes #4
2024-02-08 01:34:39 +02:00
ee7c3ea792
SL-18721 Shutdown fixes #3
...
Fix dialog box being blank in task bar
2024-01-29 22:11:35 +02:00
4a34a11966
SL-18721 Shutdown fixes
...
1. After window closes viewer still takes some time to shut down, so
added splash screen to not confuse users (and to see if something gets
stuck)
2. Having two identical mWindowHandle caused confusion for me, so I
split them. It looks like there might have been issues with thread being
stuck because thread's handle wasn't cleaned up.
3. Made region clean mCacheMap immediately instead of spending time
making copies on shutdown
2024-01-22 18:47:43 +02:00
0d8bd79c79
SL-20750 MacOS Crash processing attributed string
2024-01-11 17:18:12 +02:00
7d4de08fa9
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/llmaterialeditor.cpp
2024-01-08 23:49:38 +02:00
793bed7d06
Merge branch 'main' into DRTVWR-489
...
# Conflicts:
# indra/newview/fonts/DejaVu-license.txt
# indra/newview/fonts/DejaVuSans-Bold.ttf
# indra/newview/fonts/DejaVuSans-BoldOblique.ttf
# indra/newview/fonts/DejaVuSans-Oblique.ttf
# indra/newview/fonts/DejaVuSans.ttf
# indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
4c791e098d
Merge remote-tracking branch 'origin/main' into DRTVWR-596
2023-12-14 12:07:18 -08:00
300d7629d8
SL-20664 Potential fix for crash on startup in switchContext
2023-12-06 11:58:45 -06:00
c9cd5631e4
Merge branch 'main' into DRTVWR-489
2023-12-05 03:37:06 +01:00
54db4206e9
SL-19801 Inserting emoji characters from system emoji picker does not work on macOS
2023-11-30 15:57:35 +01:00
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
70721bae39
DRTVWR-559 Fix for mac build.
2023-11-03 11:15:19 -05:00
65fb4e67cb
SL-19979 Fix for frame stalls on mac with shadows enabled. Also fix multihreaded GL not working on mac (thanks, Rye!)
2023-11-02 10:47:15 -05:00
5b2de090c1
SL-20177: Blind attempt at fixing crash in SetWindowLongPtr. Guess based on the fact that crashes started around the time VRAM accounting was added.
2023-09-19 10:40:03 -07:00
f975cfd736
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-07-17 13:37:03 -07:00
4c848c8258
Merge branch 'main' (DRTVWR-580) into DRTVWR-587-maint-V
2023-07-17 23:18:04 +03:00
4c89ad5586
SL-19306 A method of displaying user-customized keybindings in user-visible text
2023-07-17 15:46:18 +03:00
79198eddf7
SL-19966 Reverted "SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption"
...
This reverts commit cf692c40b0
2023-07-07 20:26:05 +03:00
cb8c91ffc8
SL-19881 fix assertion failure in [NSEvent characters]
2023-06-15 14:39:05 -07:00
53ed0ec70c
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# doc/contributions.txt
2023-05-17 23:57:11 +03:00
2f44377b3e
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-05-17 11:17:48 -07:00
4dcab10bf8
Merge branch 'main' into DRTVWR-580-maint-T
...
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
2023-05-17 17:47:45 +03:00
69d444826d
Merge pull request #208 from secondlife/SL-19690
...
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
2023-05-10 09:14:14 -04:00
3f1f126186
DRTVWR-559 Remove main window proc printf debugging.
2023-05-08 15:21:04 -05:00
026ef1935d
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
...
Rather than continuing to propagate try/catch (Closed)
(aka LLThreadSafeQueueInterrupt) constructs through the code base, make
WorkQueueBase::post() return bool indicating success (i.e. ! isClosed()).
This obviates postIfOpen(), which no one was using anyway.
In effect, postIfOpen() is renamed post(), bypassing the exception when
isClosed().
Review existing try/catch blocks of that sort, changing to test for post()
returning false.
2023-05-08 12:07:31 -04:00
21ddaa6908
DRTVWR-559: Merge remote branch 'DRTVWR-559' into DRTVWR-559-zapfunc
...
Delete the debugLoggingEnabled() (changed to LL_DEBUGS()) stanzas deleted by
the upstream.
2023-05-03 10:01:39 -04:00
2a10bd406c
DRTVWR-559: Replace debugLoggingEnabled() function with LL_DEBUGS().
...
The trouble with debugLoggingEnabled() is that it locked mutexes and searched
maps every time that call was reached. LL_DEBUGS() has the same functionality
(albeit with idiosyncratic syntax) but performs expensive lookups only once
per session, caching the result in a local static variable.
2023-05-03 09:55:31 -04:00
e09475713b
DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU timer without a frame stall.
2023-05-02 18:47:21 -05:00
ade8c96e5c
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llappviewer.cpp
2023-05-02 17:57:11 +03:00
ff8dcc23bf
Merge branch 'main' into DRTVWR-577-maint-S
2023-05-02 17:39:37 +03:00
504ef7e9e3
Merge branch 'main' into DRTVWR-580-maint-T
2023-05-02 17:39:29 +03:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
895ce616ea
SL-19652 Fixed 'working' cursor flicker
2023-04-25 22:49:33 +03:00
ae2c53f52b
SL-19534 Fixed 'working' cursor flicker
2023-04-06 21:51:16 +03:00
41d24952ff
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
2023-03-31 17:17:21 +03:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
7b2205d8f6
Merge branch 'main' into DRTVWR-580-maint-T
2023-03-30 00:39:12 +03:00
5217e6bfb7
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
cf692c40b0
SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption
2023-03-20 21:08:42 +01:00
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-03-20 01:23:16 +02:00
25ede86382
SL-19172 Texture streaming tune up. Incidental decruft.
2023-03-10 10:52:35 -06:00
f1d247809b
SL-19190 Laggy behavior when turning
...
GetAsyncKeyState is luggy in some conditions and no longer needed due to fix for SL-16845 - all 'up' keys get reset when leaving window
2023-02-09 23:49:23 +02:00
95de63eaa3
DRTVWR-559 Remove some 32-bit color paranoia checks (potential fix for running under wine)
2023-02-08 11:10:15 -06:00
e7ba1753d2
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-02-03 01:46:01 +02:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
7a5381b39f
Merge branch 'main' into DRTVWR-573-maint-R
2023-02-02 21:51:07 +02:00
7bd9d21e19
Optimizations, decruft, and intel compatibility pass ( #53 )
...
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-19 09:13:45 -06:00
472ecc8088
SL-18999 IME disabling should be called in window's thread
...
For some reason positioning IME window works fine, but disabling and enabling ime works from window's thread only
2023-01-19 01:45:57 +02:00
Andrey Kleshchev