summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2025-04-18Merge branch 'release/2025.05' into marchcat/05-developAndrey Lihatskiy
2025-04-18#1424 Favorites in Appearance floater #4Andrey Kleshchev
2025-04-18#3898 Make default inventory size a bit widerAndrey Kleshchev
to fit favorites tab
2025-04-17Merge branch 'develop' into marchcat/05-developAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h
2025-04-17Restore llmath improvements from archived develop branch:Ansariel
* Make eligible functions constexpr * Use constants for vector indices where applicable * Reformat to match actual coding conventions
2025-04-17Fix lerp issues on newer GCC versionsAnsariel
2025-04-17Use standard library functions for llisnan and replace obvious NaN checks ↵Ansariel
that don't work using /fp:fast floating point behavior under MSVC
2025-04-17#3897 Fix favorite's stars being hidden in some cases #2Andrey Kleshchev
2025-04-16#3910 Sometimes can't favorite a folderAndrey Kleshchev
due to version mismatch. Should use LLInventoryModel::changeItemParent
2025-04-16Post-merge fix compareGalleryItem() in lloutfitgallery.cpp (#3917)Andrey Lihatskiy
2025-04-15Merge branch 'develop' into marchcat/05-developAndrey Lihatskiy
2025-04-15Merge pull request #3883 from williamweaver/fix/remove-duplicate-render-settingJonathan "Geenz" Goodman
Fix: Remove potentially redundant RenderAutoHideSurfaceAreaLimit sett…
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 #3896 from williamweaver/fix/tonemap-hdr-blendJonathan "Geenz" Goodman
Refactor tonemap blending to preserve HDR detail during mix
2025-04-15Merge pull request #3911 from secondlife/mainJonathan "Geenz" Goodman
Merge 2025.03 release into develop.
2025-04-15Fix llhttpdate test on windows and macos (#3909)Andrey Lihatskiy
2025-04-15#3897 Fix favorite's stars being hidden in some casesAndrey Kleshchev
2025-04-13#3900 Skip checking AFK status during startup statesAndrey Lihatskiy
2025-04-12#3379 Crash on gIdleCallbacks iterationAndrey Kleshchev
2025-04-12Refactor LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()Andrey Lihatskiy
Key improvements: 1. Better error handling for thread detachment 2. More careful sequencing of operations 3. Ensuring the window is hidden before proceeding with other shutdown steps 4. Proper checking of thread joinability before detaching
2025-04-11Fix(Tonemap): Correct blend logic to preserve HDR detailWilliam Weaver
The blending operation for the `tonemap_mix` uniform in `postDeferredTonemap.glsl` incorrectly used a prematurely clamped color value as the source for the linear mix target. Specifically, the exposed HDR input color was clamped to the [0, 1] LDR range before being used in the `mix()` function when `tonemap_mix < 1.0`. This premature clamping resulted in the loss of High Dynamic Range (HDR) detail in highlights during the blend operation. As `tonemap_mix` was reduced, instead of smoothly blending towards the linear scene representation, clipped highlights were incorrectly reintroduced. This commit modifies the `toneMap` and `toneMapNoExposure` functions to correct this logic: 1. The original linear input color is preserved before exposure/processing. 2. The appropriate exposure factor is calculated and applied separately. 3. The chosen tone mapping operator is applied to the exposed color, storing the result. 4. The `mix()` function now correctly blends between the appropriately scaled, *unclamped* linear input color and the fully tone-mapped result. 5. The final clamp to the [0, 1] LDR range is applied *after* the blend operation. This change ensures that HDR information is preserved throughout the blending process, resulting in a smoother, more perceptually correct visual transition as `tonemap_mix` is adjusted. While the effect is nuanced, it is noticeable in bright highlights; with the legacy code, these highlights appeared visibly clipped and less intense during the blend, whereas the corrected code allows them to retain their peak brightness and detail more accurately. This makes the `tonemap_mix` control more intuitive, behaving as a true intensity blend for the tone mapping effect without introducing clipping artifacts. The computational cost is negligible.
2025-04-11#3383 'InventoryAddAttachmentBehavior' setting should affect inventory panel ↵Maxim Nikolenko
in List view; update persistence of new settings
2025-04-11#3403 fix Favorited worn outfit not coloured in My Outfits tabMaxim Nikolenko
2025-04-11#3394 Fix colour change not applied to favourites in Outfit GalleryMaxim Nikolenko
2025-04-11#3377 Select 'All items' tab when creating a folder via '+' buttonMaxim Nikolenko
2025-04-11#3374 Fix item reparenting moving containing folderAndrey Kleshchev
2025-04-11#3374 LLFolderViewFolder::updateHasFavoritesAndrey Kleshchev
2025-04-11#3373 Rename "My Favorites" system folder to "Favorites Bar"Maxim Nikolenko
2025-04-11#3354 adjust controls positions to avoid overlappingMaxim Nikolenko
# Conflicts: # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
2025-04-11#3353 Fix favorited items not being readded on parent removalAndrey Kleshchev
2025-04-11#3367 Move Maximum # of animated avatars slider in GraphicsAndrey Lihatskiy
2025-04-11Give control over thread queue's automatic shutdownAndrey Kleshchev
2025-04-11Apply changes from 55f2103adc36db0d3f068a31a144e15465226e13 to ↵Ansariel Hiller
LLFolderViewItem::drawFavoriteIcon (#2867) # Conflicts: # indra/llui/llfolderviewitem.cpp
2025-04-11Fix more merge issues:Ansariel
* Re-apply changes from a620e58daccf92b5b8d61347312739720ed2b51a * Fix duplicate code resulting from 826236f1bc065fba257d7954d11ac98c59493445 # Conflicts: # indra/llwindow/llwindowwin32.cpp
2025-04-10Convert BOOL to boolAnsariel
# Conflicts: # indra/newview/llagent.cpp
2025-04-10Fix merge issues:Ansariel
* Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp * Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors # Conflicts: # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llui/llfolderviewitem.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llvoavatar.cpp
2025-04-10Post-merge cleanup: llvoavatar.cppAndrey Lihatskiy
2025-04-10Post-merge cleanup: llwindowwin32.cppAndrey Lihatskiy
2025-04-10Fix missing inventory unlockAndrey Kleshchev
2025-04-10macos buildfixAndrey Lihatskiy
2025-04-10Fix pre-commit errorAndrey Lihatskiy
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-04-10Merge commit '7947ce3' into marchcat/maint-c/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2025-04-09Merge pull request #3853 from williamweaver/fix/cloud-texture-loadingJonathan "Geenz" Goodman
Fix: Apply Cloud Texture Changes from Environment Settings Floater
2025-04-08#3892 Crash at fillCompositionLogfontAndrey Kleshchev
2025-04-08Bump feature table version.Jonathan "Geenz" Goodman
2025-04-08#3745 fix for showing system notification on login #2Maxim Nikolenko
2025-04-07#3884 Crash in kdu_core::kdu_params::getAndrey Kleshchev
2025-04-07#3627 std::bad_alloc in EventPollAndrey Kleshchev
2025-04-07#3627 std::bad_alloc when loading a modelAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-14 15:27:48 +0000