38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
eab5beb54c
Merge branch 'main' into marchcat/x-merge
...
# Conflicts:
# indra/llimage/llimageworker.cpp
# indra/llimage/llimageworker.h
# indra/newview/llcontrolavatar.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/lltexturefetch.cpp
2024-04-12 15:43:34 +03:00
1161262029
SL-18721 Restore release behavior
...
Closing window correctly caused a significant amount of logout freezes
with no known reproes. Temporarily returning to old behavior were thread
was killes without closing window and will reenable in later maints to
hopefully get a scenario or at least more data of what is causing the
freeze.
2024-03-15 19:44:38 +02:00
fe3be58938
SL-18721 Shutdown fixes #6
2024-03-01 18:20:01 +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
5c7903bfdc
Crash in switch context
...
Looks like a crash at SetWindowLongPtr due to handle being zero
2024-01-25 19:02:57 +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
afe91b7eb6
Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-08 21:33:06 +02:00
300d7629d8
SL-20664 Potential fix for crash on startup in switchContext
2023-12-06 11:58:45 -06:00
27dae1d967
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30 13:30:27 +02:00
92f2cf6089
SL-13610 build fix
2023-10-23 16:08:46 +03:00
3084f86417
SL-13610 [MAC] Manufacturer based search
2023-10-23 15:26:19 +03:00
453a4a13f8
SL-13610 [MAC] WIP enable initing devices by local id
2023-10-23 15:26:19 +03:00
9b27b6e509
SL-13610 [MAC] WIP List HID available devices in joystick selection
...
Doesn't filter the list yet, just shows full list of usb devices
Selecting visible devices doesn't work yet
2023-10-23 15:26:19 +03: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
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
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07: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
25ede86382
SL-19172 Texture streaming tune up. Incidental decruft.
2023-03-10 10:52:35 -06: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
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
89f3bf6c13
SL-18985 Crash at std::basic_string::erase
2023-01-18 19:20:36 +02:00
f9866a3543
Merge branch 'main' into DRTVWR-573-maint-R
...
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
2023-01-12 04:37:42 +02:00
89f21f276f
SL-18719 GL 3.0/3.1 compatibility pass.
2022-12-16 14:58:02 -06:00
553a98723b
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
2022-12-13 08:05:03 +02:00
eb526fec0a
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2022-12-12 17:59:34 -08:00
2ab424493f
DRTVWR-559 Fix for windows build.
2022-12-12 13:49:28 -06:00
87bb72a47a
SL-18154 WIP -- CPU sampling (AMD uProf) profile guided optimizations to reduce CPU usage of background threads.
2022-11-30 13:25:00 -06:00
b5db671f7c
SL-18682 WIP -- Add debug settings that aid in emulating low end hardware.
2022-11-29 09:15:02 -06:00
d01f7afff2
SL-18713 fix crash in handleCompositionMessage ( #12 )
2022-11-25 18:16:31 +02:00
e2d1af5c4f
SL-18154 Profile guided optimizations -- remove some unneeded operations and make LLDrawPoolMaterials less branchy.
2022-11-17 13:35:39 -06:00
a53ccb2379
SL-18136 fix for Japanese IME
2022-11-02 19:38:01 +02:00
800044fb33
Merged in SL-17005_cosmic_win8 (pull request #1106 )
...
SL-17005: Clean up debug code
2022-10-26 20:16:55 +00:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
ec5009d70e
SL-18190 Potential fix for sapping CPU when "sleeping"
2022-10-13 19:51:40 -05:00
9448db5d4a
SL-18190 Water shader WIP. Better parallax correction for sphere probes. Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
2022-10-06 18:40:01 -05:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
bde0961297
Merge branch 'DRTVWR-563' of bitbucket.org:lindenlab/viewer into DRTVWR-563
2022-08-26 10:52:07 -05:00
9bee2a92d2
SL-17997 Follow up from beta breakers results.
2022-08-26 10:51:42 -05:00
Andrey Lihatskiy