summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Collapse)Author
2025-08-08Merge tag 'Second_Life_Release#55f1c8b9-2025.06' into 2025.06Erik Kundiman
2025-08-08Merge branch '2025.05' into 2025.06Erik Kundiman
2025-08-06Merge branch develop into 2025.06Andrey Kleshchev
# Conflicts: # indra/newview/llvoavatar.cpp
2025-07-28#3969 Make inventory creation from cache fasterAndrey Kleshchev
Still has a lot of space for improvements, but should be 2.5 times faster
2025-07-03Merge tag 'Second_Life_Project#bca9ba9b-glTF_Mesh_Import' into gltf_mesh_importErik Kundiman
2025-06-10Fixed adding skies to day cycle by ensuring mAbsorptionConfigs, mMieConfigs ↵Hecklezz
and mRayleightConfigs don't become null
2025-06-02Adds missing ambient color blending to day cycleHecklezz
2025-05-29Merge branch 'main' into 2025.05Erik Kundiman
2025-05-29Merge tag 'Second_Life_Project#b9ab6c36-2025.05' into 2025.05Erik Kundiman
2025-05-28Merge branch 'main' into marchcat/2505-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h
2025-05-28Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-developJonathan "Geenz" Goodman
2025-05-20#4000 Cherry pick inventory LEAP functions from develop branchMaxim Nikolenko
2025-05-05#1300 Test coverage for inventory metadataAndrey Kleshchev
For now it's random, needs more consistent coverage
2025-05-05#3905 Crashes in LLInventoryModel::saveToFileAndrey Kleshchev
I don't expect it to fix the problem. Just making things more explicit in places of most frequent crashes.
2025-04-19Merge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
2025-04-19Merge tag 'Second_Life_Release#9a333e65-2025.04' into 2025.04Erik Kundiman
2025-04-18More constexpr improvements and cleanup of includes of a deleted header fileAnsariel Hiller
2025-04-18Merge develop into release/2025.04Andrey Kleshchev
2025-04-15Merge branch 'develop' into marchcat/05-developAndrey Lihatskiy
2025-04-15#3863 Ensure cloud texture selection updates the skyAndrey Kleshchev
2025-04-15Merge branch 'main' into marchcat/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp
2025-04-15Merge pull request #3911 from secondlife/mainJonathan "Geenz" Goodman
Merge 2025.03 release into develop.
2025-04-10Merge commit '9e24b30' into marchcat/maint-c/restoreAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp
2025-03-21prevent erroneous edit of wrong parcel (#3759)Andrew Meadows
* prevent erroneous edit of wrong parcel Fixes jira-archive-internal/issues/70771 [SL-20409] Erroneous Local Parcel Twins - Parcel Updates Across Region Borders - unrequested updateDatabaseParcel changes * remove unused argument in sendParcelPropertiesUpdate()
2025-03-06Merge remote-tracking branch 'secondlife/release/2025.03' into 2025.03Erik Kundiman
2025-03-06Merge commit '8c1f00eebc6863c39d0143aeb7e37c68459d454f' into 2025.03Erik Kundiman
2025-03-04#3643 Use bugsplat attributes on MacOSAndrey Kleshchev
2025-02-18#3511 fix for PBR skies being too bright on Low GraphicsMaxim Nikolenko
2025-01-23Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into ↵Erik Kundiman
2024.12-ForeverFPS
2025-01-22#3452 Crash in LLSaleInfo::asLLSD()Andrey Kleshchev
2025-01-20Merge remote-tracking branch 'secondlife/release/2024.12-ForeverFPS' into ↵Erik Kundiman
2024.12-ForeverFPS
2025-01-02#3311 RenderSkyAutoAdjustLegacy does not engage tonemapperAndrey Kleshchev
2024-12-01Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-11-28#3170 Fix for tonemapping not working with PBR skies.Jonathan "Geenz" Goodman
2024-11-29viewer#3170 Fix tonemaping sliderAndrey Kleshchev
At the moment slider is in general settings, not per environment
2024-11-26Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-11-25Drop emissive on old Intel GPUs (#3110)Jonathan "Geenz" Goodman
* #3103 Add the ability to disable the emissive buffer for older GPUs with low memory bandwidth. * #3135 Add a "vintage" mode for slower GPUs * #2719 Fix for skies being overbrightened * #2632 Do not apply tonemapping on legacy skies
2024-11-06Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-31viewer#2889 Fix water's normal map being ignoredAndrey Kleshchev
2024-10-19Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-18viewer#2889 Fixed mixed up water settingsAndrey Kleshchev
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-18Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into ↵Erik Kundiman
2024.09-ExtraFPS
2024-10-02viewer#2705 Some sky parameters weren't updatingAndrey Kleshchev
2024-09-30viewer#2735 Fix day cycle not saving valuesAndrey Kleshchev
2024-09-23viewer#2627 instead of checking map for being empty got empty mapAndrey Kleshchev
2024-09-12viewer#2529 Optimize LLSettingsWater::blendAndrey Kleshchev
2024-09-11viewer#2529 Optimize LLSettingsSky::blendAndrey Kleshchev
2024-09-11viewer#2529 Track interpolateSDMap's performanceAndrey Kleshchev
viewer#2529 Fix initialization
2024-09-11viewer#2529 Optimize updateGLVariablesForSettingsAndrey Kleshchev
Intent is to eventually use only stored variables for everything. LLSD operations are far too expensive.
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-14 02:30:20 +0000