summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
20 hourspanel_preferences_graphics.xml adjustment II2025.05secretfoxtail
Remove redundant IndirectMaxNonImposters slider.
21 hourspanel_preferences_graphics1.xml adjustmentsecretfoxtail
Move preset buttons out of the way of exposure slider.
46 hoursMerge tag 'Second_Life_Release#11cd9b9-2025.05' into 2025.05Erik Kundiman
3 daysMerge branch 'develop' into marchcat/05-developAndrey Lihatskiy
3 daysMerge branch 'release/2025.05' into marchcat/05-developAndrey Lihatskiy
3 days#1424 Favorites in Appearance floater #4Andrey Kleshchev
3 days#3898 Make default inventory size a bit widerAndrey Kleshchev
to fit favorites tab
4 daysMerge pull request #3933 from Ansariel/develop-llui-improvementsJonathan "Geenz" Goodman
Clean up LLUI and fix/add suggestions from VS
4 daysClean up LLUI and fix/add suggestions from VS (#2746)Ansariel Hiller
# Conflicts: # indra/llui/lltextbase.h # indra/llui/lltexteditor.h # indra/llwindow/llwindowsdl.cpp
4 daysForce snapshot update when opening a snapshot panel and the resolution is ↵Ansariel
"Current Window" to determine correct image size and upload cost
4 daysRemove incorrectly calculated upload fee from snapshot options button based ↵Ansariel
on previously selected snapshot type and not necessarily snapshot to inventory
4 daysFix upload cost calculation for snapshots to inventory based on encoded ↵Ansariel
image size and display upload cost to user
4 daysRemove orphaned LLPanelOutfitSnapshotInventoryAnsariel
# Conflicts: # indra/newview/llpanelsnapshotinventory.cpp
4 daysMerge branch 'develop' into marchcat/05-developAndrey Lihatskiy
# Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h
4 daysFix lerp issues on newer GCC versionsAnsariel
4 daysUse standard library functions for llisnan and replace obvious NaN checks ↵Ansariel
that don't work using /fp:fast floating point behavior under MSVC
4 daysRemove dependency on uriparserErik Kundiman
Turns out it hasn't been needed, might be leftover from system Collada DOM, and LL has their own URI parser.
5 days#3910 Sometimes can't favorite a folderAndrey Kleshchev
due to version mismatch. Should use LLInventoryModel::changeItemParent
5 daysPost-merge fix compareGalleryItem() in lloutfitgallery.cpp (#3917)Andrey Lihatskiy
6 daysMerge branch 'develop' into marchcat/05-developAndrey Lihatskiy
6 daysMerge pull request #3883 from williamweaver/fix/remove-duplicate-render-settingJonathan "Geenz" Goodman
Fix: Remove potentially redundant RenderAutoHideSurfaceAreaLimit sett…
6 daysMerge 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
6 daysMerge pull request #3896 from williamweaver/fix/tonemap-hdr-blendJonathan "Geenz" Goodman
Refactor tonemap blending to preserve HDR detail during mix
6 daysMerge pull request #3911 from secondlife/mainJonathan "Geenz" Goodman
Merge 2025.03 release into develop.
9 days#3900 Skip checking AFK status during startup statesAndrey Lihatskiy
11 daysFix(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.
11 days#3383 'InventoryAddAttachmentBehavior' setting should affect inventory panel ↵Maxim Nikolenko
in List view; update persistence of new settings
11 days#3403 fix Favorited worn outfit not coloured in My Outfits tabMaxim Nikolenko
11 days#3394 Fix colour change not applied to favourites in Outfit GalleryMaxim Nikolenko
11 days#3377 Select 'All items' tab when creating a folder via '+' buttonMaxim Nikolenko
11 days#3374 Fix item reparenting moving containing folderAndrey Kleshchev
11 days#3374 LLFolderViewFolder::updateHasFavoritesAndrey Kleshchev
11 days#3373 Rename "My Favorites" system folder to "Favorites Bar"Maxim Nikolenko
11 days#3354 adjust controls positions to avoid overlappingMaxim Nikolenko
# Conflicts: # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
11 days#3353 Fix favorited items not being readded on parent removalAndrey Kleshchev
11 days#3367 Move Maximum # of animated avatars slider in GraphicsAndrey Lihatskiy
11 daysFix more merge issues:Ansariel
* Re-apply changes from a620e58daccf92b5b8d61347312739720ed2b51a * Fix duplicate code resulting from 826236f1bc065fba257d7954d11ac98c59493445 # Conflicts: # indra/llwindow/llwindowwin32.cpp
11 daysConvert BOOL to boolAnsariel
# Conflicts: # indra/newview/llagent.cpp
11 daysFix 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
11 daysPost-merge cleanup: llvoavatar.cppAndrey Lihatskiy
11 daysFix missing inventory unlockAndrey Kleshchev
11 daysmacos buildfixAndrey Lihatskiy
11 daysMerge 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
12 daysMerge commit '7947ce3' into marchcat/maint-c/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
12 daysMerge pull request #3853 from williamweaver/fix/cloud-texture-loadingJonathan "Geenz" Goodman
Fix: Apply Cloud Texture Changes from Environment Settings Floater
12 daysMerge tag 'Second_Life_Release#632a8648-2025.03' into 2025.03Erik Kundiman
13 daysBump feature table version.Jonathan "Geenz" Goodman
13 daysMerge branch 'main' into 2025.03Erik Kundiman
13 daysSuppression of a redondant call in LLDrawPoolWaterExclusionmobserveur
The second call to pwaterpool->pushWaterPlanes(1) is a reminicence of an older method where it was using 2 passes.
13 daysFixing Low preset making things dark on macmobserveur
Adjustments in the featuretable for mac so the low preset doesn't render dark. RenderReflectionsEnabled set to 0 and RenderReflectionProbeCount set to 1 was causing the issue.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 12:29:43 +0000