summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-10Switch to smaller runners (#3722)Jonathan "Geenz" Goodman
* Switch to smaller runners * Make the runner conditional based upon a specific tag. Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
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-08Merge pull request #3891 from secondlife/geenz/25.03-feature-table-bumpJonathan "Geenz" Goodman
Bump feature table version.
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#3873 Return back AudioLevelWindAndrey Kleshchev
Partial revert from d00b6e4216bb308ae075d90dfa871c902d765f8d Our statistics claimed that AudioLevelWind is unused, but it is in use.
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
2025-04-07#3878 Crash at LLPipeline::unlinkDrawableAndrey Kleshchev
assertInitializedDoError() on shutdown
2025-04-07#3870 Crash at LLVOAvatarSelf::getJoint()Andrey Kleshchev
A long standing one
2025-04-07#3868 Crash in updateHoveredStateAndrey Kleshchev
according to bugsplat mWrapperPanel is null.
2025-04-07#3849 Crash at LLSelectMgr::updatePointAtAndrey Kleshchev
2025-04-07#3846 Crash at updateGLTFMaterialsAndrey Kleshchev
2025-04-07Fix: Remove potentially redundant RenderAutoHideSurfaceAreaLimit setting ↵William Weaver
registration This commit removes a seemingly duplicated `connectRefreshCachedSettingsSafe` call in `LLPipeline::init()` for the `RenderAutoHideSurfaceAreaLimit` setting. A duplicated registration for this setting was identified during a review of `LLPipeline::init()`. Double registration can lead to unexpected behavior, including potential CPU overhead. The duplication *may* have been introduced with commit 440c7b2 (Added CollectFontVertexBuffers feature), though this requires further confirmation. Testing Performed: After removing the duplicate registration, the `RenderAutoHideSurfaceAreaLimit` functionality was validated by ensuring the following behavior (consistent with the existing code): * A value of 0 (zero) causes all objects to appear regardless of size. * Values slightly above zero result in only small objects appearing, with all others hidden. * Increasing the value causes objects of increasing size to appear, while smaller objects remain visible. This change merits careful review to ensure it has no unintended side effects, and to confirm the accuracy of these observations from other developers.
2025-04-06#3627 std::bad_alloc when loading a modelAndrey Kleshchev
2025-04-05#3575 Shrink draw distance when VRAM is very lowAndrey Kleshchev
2025-04-05#3575 Adjust VRAM budget test a bitAndrey Kleshchev
2025-04-05#3575 Clean up obsolete VRAM detectin logicAndrey Kleshchev
2025-04-04#3876 sendLogoutRequest loggingAndrey Kleshchev
mac's crash logs seem to get mixed with normal logs, hope is this will help confirming the issue. Also needed for automated testing.
2025-04-04#3878 Crash at LLPipeline::unlinkDrawableAndrey Kleshchev
assertInitializedDoError() on shutdown
2025-04-04Merge pull request #3854 from williamweaver/fix/xui-parsing-fixesJonathan "Geenz" Goodman
Fix: Resolve Minor XUI Parsing Warnings in Environment Widgets
2025-04-04Fix(EnvAdjust): Properly update sky after cloud texture selectionWilliam Weaver
Problem: When selecting a new cloud texture in the Personal Lighting floater (LLFloaterEnvironmentAdjust), the sky did not visually update. The code previously only updated LiveSky->setCloudNoiseTextureId() and called mLiveSky->update(), which failed to notify the global LLEnvironment mechanism or the renderer about the new texture. Cause: Relying solely on mLiveSky for environment changes is insufficient. To update the live environment layer (ENV_LOCAL) and trigger a render refresh, calls to LLEnvironment::setEnvironment() and LLEnvironment::updateEnvironment() are required. Solution: 1. Remove an unnecessary null-check for getChild<LLTextureCtrl>, as getChild() never returns null. 2. Clone the current sky settings (mLiveSky->buildClone()) to avoid modifying a shared environment object directly. 3. Apply the new cloud texture ID to the clone. 4. Use LLEnvironment::setEnvironment(ENV_LOCAL, sky_to_set) to apply the updated settings to the user's local environment override. 5. Call LLEnvironment::updateEnvironment(LLEnvironment::TRANSITION_INSTANT, true) to ensure the renderer recognizes and displays the updated texture immediately. 6. Reset the picker control’s value to match the newly applied texture for UI consistency. Additional Note: A partial implementation was inadvertently committed earlier (commit`04af042`) due to a local staging error. This commit supersedes that incomplete change by correctly implementing the intended fix. Result: Selecting a new cloud texture from LLFloaterEnvironmentAdjust now immediately updates both the in-world sky rendering and the texture preview UI, ensuring consistency and clarity for users. Testing: - Open the Personal Lighting floater and select various cloud textures. - Verify that the sky updates immediately for each new selection. - Confirm that the texture picker also updates to reflect the selected texture.
2025-04-04#2702 Increase hover height's limitAndrey Kleshchev
2025-04-04#3870 Crash at LLVOAvatarSelf::getJoint()Andrey Kleshchev
A long standing one
2025-04-04#3868 Crash in updateHoveredStateAndrey Kleshchev
according to bugsplat mWrapperPanel is null.
2025-04-04Merge branch 'secondlife:develop' into fix/cloud-texture-loadingWilliam Weaver
2025-04-03Merge pull request #3869 from secondlife/mainJonathan "Geenz" Goodman
Add discord channel for open source discussion.
2025-04-03Add discord channel for open source discussion.Jonathan "Geenz" Goodman
2025-04-03Merge pull request #3866 from secondlife/maxim/2025.04-3857Maxim Nikolenko
#3857 pick new and updated LEAP functions from develop branch
2025-04-03#3857 teleport finished/failed eventMnikolenko Productengine
2025-04-03#3857 second batch of new or updated LEAP functionsMnikolenko Productengine
2025-04-03# 3826 Physics Material Type does not update for linked objectsAndrey Kleshchev
2025-04-02Fix normal and specular repeats per meter scalingHecklezz
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-03 05:59:11 +0000