summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2024-05-15Merge branch 'main' into marchcat/x-mf-mergeAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llfloaterimagepreview.cpp
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-15Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-mergeAndrey Lihatskiy
2024-05-15Merge branch 'release/maint-x' into marchcat/x-b-mergeAndrey Lihatskiy
to pick up mac build fixes
2024-05-15Merge branch 'main' into marchcat/x-b-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/ConfigurePkgConfig.cmake # indra/cmake/ICU4C.cmake # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h # indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h # indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llfloateremojipicker.cpp # indra/newview/lloutfitslist.cpp
2024-05-14Increment viewer version to 7.1.8Nat Goodspeed
following promotion of secondlife/viewer #705: Maintenance X
2024-05-14Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: ↵Nat Goodspeed
Maintenance X
2024-05-14Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-05-14#1457 Fix the tests on macAndrey Lihatskiy
2024-05-13Update volume_catcher.hNicky Dasmijn
Add a virtual dtor
2024-05-13viewer-private#236 Don't block removal of marketplace foldersAndrey Kleshchev
Marketplace is not visible outside of own floater and that floater will do an extra warning when deleting listings that have additional data.
2024-05-13Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # autobuild.xml
2024-05-09Bump up coroutine stack size: saw C00000FD test termination.Nat Goodspeed
(cherry picked from commit dc0b3aed4782e4e4835fd6b9d59d1d70b78be4a7)
2024-05-09enable ime on xwayland (environment setting move)AiraYumi
2024-05-08Fix for mirrors not functioning properly under water. (#1436)Jonathan "Geenz" Goodman
* #1165 Fix for clipping and culling for mirrors under water.
2024-05-08Even more mirror fixes. (#1429)Jonathan "Geenz" Goodman
#1271 Add support for mirrors that do not have avatars in them. It does this based on if the probe is set to dynamic or not. #1370 More optimization work to reduce GPU utilization. #1058 - Removed sim feature flag that was overriding mirrors enabled flags secondlife/viewer-private#128 - Locally cache the mirror probe #679 Add additional options to the build floater for mirror probes, including descriptions.
2024-05-08enable ime on xwaylandAiraYumi
2024-05-02Update LLGLTFMaterial tests for changes introduced in SL-20523Brad Linden
also correct member packing to match server side
2024-05-01#1382 Fix for scrubbing occlusion channel of ORM map (#1383)RunitaiLinden
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
2024-04-30Fix for SL-20652 shadows on mac breaking alpha blended objects. (#1264)Brad Linden
* Fix for SL-20652 shadows on mac breaking alpha blended objects. fix secondlife/jira-archive-internal#71030 * clean up surrounding indentation * Skip unnecessary casting * Clean up LLGLSLShader::sIndexedTextureChannels usage and improve fix for SL-20652
2024-04-30Fix for black moon. (#1369)RunitaiLinden
2024-04-29Adapt llimageworker_test for updated virtual method API.Nat Goodspeed
This was a broken test that got all the way to viewer release and the main branch. (cherry picked from commit a33a9d29380e6c1a0a9cc539be309d47adef4acf)
2024-04-29#886 Fix for crash in LLBumpImageList when connecting to a simulator with ↵RunitaiLinden
different feature flags (#1345)
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-27viewer-private#217 Cef log was deleted too oftenAndrey Kleshchev
delete once per session, not once per instance
2024-04-26#1325 Fix for GLTF overrides sometimes not showing up. (#1340)RunitaiLinden
2024-04-26Merge pull request #1337 from secondlife/v-1184cosmic-linden
Cached minimap textures still using extra memory/loading still not reliable
2024-04-26secondlife/viewer#1184: Remove logspamCosmic Linden
2024-04-26Fix null volume catcher on macOSMaki
2024-04-25secondlife/viewer#1184: Fix mac buildCosmic Linden
2024-04-25secondlife/viewer#1184: Discourage use of forceToRefetchTextureCosmic Linden
2024-04-25secondlife/viewer#1184: Use more robust/memory-friendly setLoadedCallback ↵Cosmic Linden
for minimap gen. Fix some emissive maps.
2024-04-26viewer#1308 LLFloaterView::restoreAll CrashAndrey Kleshchev
2024-04-25Adapt llimageworker_test for updated virtual method API.Nat Goodspeed
This was a broken test that got all the way to viewer release and the main branch. (cherry picked from commit a33a9d29380e6c1a0a9cc539be309d47adef4acf)
2024-04-25Remove invalid text color parameter from panel_login_first.xmlnerodevo
Follow-up to previous commit 4a07fd3. This will resolve the warning showing up when loading the viewer for the first time.
2024-04-24viewer#1309 Handle deprecated avatar properties messagesAndrey Kleshchev
since server still sends those in some cases
2024-04-24Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-04-24Merge branch 'main' into marchcat/b-mergeAndrey Lihatskiy
2024-04-24Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
2024-04-241285 GLTF Animation PrototypeRunitaiLinden
2024-04-24Increment viewer version to 7.1.7Nat Goodspeed
following promotion of secondlife/viewer #736
2024-04-24Fix building for other platforms than Linux for volume catcherMaki
2024-04-22Tabs to spacesNicky
2024-04-22Replace NULL with nullptrNicky
2024-04-22Stream the volume catcher a little:Nicky
- Use LL_DEBUGS() for potential debug output. - Enclose mutex locking in their own scope, to make unlocking automatic and also limit the life time of a lock to as short as possible - Introduce mCleanupMutex to replace std::unique_lock pwLock(*this). I'm baffled using lock as a mutex like that did even compile. - Remove virtual inheritance, as it is not needed here.
2024-04-21Fix sampling normals from gbuffer and cleanup redundant gbuffer samples (#1294)Rye Mutt
* Fix sampling normals from gbuffer and cleanup redundant gbuffer samples * Allow negative normals in gbuffer to fix broken material rendering
2024-04-21Remove virtual inheritence for linux volume catcherMaki
2024-04-20Rework macro magic for symbol grabberMaki
2024-04-20Fix more style issues and add missing RAII lockMaki