summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2024-06-20Merge remote-tracking branch 'secondlife/release/maint-b' into maint-bErik Kundiman
2024-06-14Merge branch 'release/maint-b' into marchcat/b-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml # indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl # indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl # indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl # indra/newview/llfilepicker.cpp
2024-06-11Merge tag '7.1.8-release'Erik Kundiman
source for viewer 7.1.8.9375512768
2024-05-16Merge tag '7.1.7-release'Erik Kundiman
source for viewer 7.1.7.8974243247
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 '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-14Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: ↵Nat Goodspeed
Maintenance X
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-02Update LLGLTFMaterial tests for changes introduced in SL-20523Brad Linden
also correct member packing to match server side
2024-05-01Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-mergeAndrey Lihatskiy
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-25Merge tag '7.1.6-release'Erik Kundiman
source for viewer 7.1.6.8745209917
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-20Merge tag '7.1.5-release'Erik Kundiman
source for viewer 7.1.5.8443591509
2024-04-15secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00Alexander Gavriliuk
2024-04-12Merge branch 'main' into marchcat/x-mergeAndrey Lihatskiy
# 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-10Merge branch 'main' into marchcat/y-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp
2024-04-10Merge branch 'main' into marchcat/b-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/newview/lloutfitslist.cpp
2024-04-09Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-04-05Linux viewer (ReleaseOS) resurrection (#1099)Nicky Dasmijn
Co-authored-by: AiraYumi <aira.youme@airanyumi.net>
2024-03-20secondlife/viewer-issues#83: Add TODO/assert for deciding when to allow ↵Cosmic Linden
candidate future extensions on PBR terrain
2024-02-06#740 Make sure we evaluate if the probe is a mirror probe or not.Jonathan "Geenz" Goodman
#682 Re-enable gaussian filtering, and reduce the mirror resolution back to 1024. Also just generally clean up the code a bit.
2024-02-06#679 Add mirror update params to the volume floater.Jonathan "Geenz" Goodman
#740 Add support for FLAG_MIRROR in the viewer for mirror probes.
2024-01-24Merge remote-tracking branch 'origin/release/materials_featurette' into ↵Jonathan "Geenz" Goodman
DRTVWR-583
2024-01-09Merge tag '7.1.2-release'Erik Kundiman
source for viewer 7.1.2.7215179142
2024-01-09SL-20781 Follow up on boost to std replacementAndrey Kleshchev
2024-01-08replace boost library to standardAiraYumi
2024-01-08Merge branch 'main' into DRTVWR-599-maint-ZAndrey Lihatskiy
2024-01-08Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2024-01-08Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-XAndrey Kleshchev
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2023-12-18Unix install sets plugin dir to system library dirErik Kundiman
because (at least) the vlc/plugins dirs are inside it in the same way it's been inside llplugin. This is so the app can find system VLC plugins. And for this, BUILD_SHARED_LIBS set on must work first on Linux (has already been working on FreeBSD), since libmedia_plugin_libvlc is a shared library (which now gets installed to system library dir too, on both OSes).
2023-12-15SL-15628 Crash inside ~LLModelInstanceBaseAndrey Kleshchev
More explicit cleanup in hopes of narrowing down which of the models failed
2023-11-30Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-mergeAndrey Lihatskiy
# 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-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml
2023-11-23SL-18875 Crash at LLModel::writeModelAndrey Kleshchev
Looks like a crash iterating over weight_list& weights = model[idx]->getJointInfluences(pos);
2023-11-21Fix failure to save the normalized translation data during collada uploadRye Mutt
2023-11-15Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596RunitaiLinden
2023-11-15Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-11-14SL-20340 Fix for off-by-epsilon hack falling off when serializing overrides ↵RunitaiLinden
as LLSD. (#513)
2023-11-13Drtvwr 596 11/8/2023 (#501)RunitaiLinden
* SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials. * SL-20582 Fix for overriding to alpha mode blend not working. Incidental decruft of dead code (thanks, Rye!)
2023-11-08SL-20582 Fix for overriding to alpha mode blend not working. Incidental ↵RunitaiLinden
decruft of dead code (thanks, Rye!)
2023-11-07Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-11-06SL-20523 Ensure override gets updated before render materialAndrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #5Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #4Andrey Kleshchev
2023-11-06SL-20523 Local textures not updating on PBR Materials #3Andrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 08:26:32 +0000