summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
12 days#3374 Fix item reparenting moving containing folderAndrey Kleshchev
12 days#3374 LLFolderViewFolder::updateHasFavoritesAndrey Kleshchev
12 days#3373 Rename "My Favorites" system folder to "Favorites Bar"Maxim Nikolenko
12 days#3354 adjust controls positions to avoid overlappingMaxim Nikolenko
# Conflicts: # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
12 days#3353 Fix favorited items not being readded on parent removalAndrey Kleshchev
12 days#3367 Move Maximum # of animated avatars slider in GraphicsAndrey Lihatskiy
12 daysGive control over thread queue's automatic shutdownAndrey Kleshchev
12 daysApply changes from 55f2103adc36db0d3f068a31a144e15465226e13 to ↵Ansariel Hiller
LLFolderViewItem::drawFavoriteIcon (#2867) # Conflicts: # indra/llui/llfolderviewitem.cpp
12 daysFix more merge issues:Ansariel
* Re-apply changes from a620e58daccf92b5b8d61347312739720ed2b51a * Fix duplicate code resulting from 826236f1bc065fba257d7954d11ac98c59493445 # Conflicts: # indra/llwindow/llwindowwin32.cpp
12 daysConvert BOOL to boolAnsariel
# Conflicts: # indra/newview/llagent.cpp
12 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
12 daysPost-merge cleanup: llvoavatar.cppAndrey Lihatskiy
12 daysPost-merge cleanup: llwindowwin32.cppAndrey Lihatskiy
12 daysFix missing inventory unlockAndrey Kleshchev
13 daysmacos buildfixAndrey Lihatskiy
13 daysSwitch 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>
13 daysFix pre-commit errorAndrey Lihatskiy
13 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
13 daysMerge commit '7947ce3' into marchcat/maint-c/maint-c-restoreAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2025-04-03Add discord channel for open source discussion.Jonathan "Geenz" Goodman
2025-03-06Merge pull request #3304 from secondlife/release/2024.12-ForeverFPSJonathan "Geenz" Goodman
2024.12 ForeverFPS
2025-02-26Revert "#2639 GPU test twice to fix misreported bandwidth (#3558)"Andrey Kleshchev
This reverts commit b0d80552b3177269eb24ef9a1e0d58a98d95a96f.
2025-02-26#3270 use TELEPORT_LOCAL when teleporting within a region via landmarkMaxim Nikolenko
2025-02-25Merge pull request #3610 from secondlife/geenz/mirrors-enabled-fixJonathan "Geenz" Goodman
#3331 - Mirrors no longer function on relog
2025-02-25Mitigation for #3331Jonathan "Geenz" Goodman
2025-02-24Merge pull request #3602 from secondlife/geenz/eep-setting-fixesJonathan "Geenz" Goodman
- #3594 Adjustments to mitigate sun reflection being too narrow.
2025-02-24Merge branch 'release/2024.12-ForeverFPS' into geenz/eep-setting-fixesJonathan "Geenz" Goodman
2025-02-24Backout minimal+ change.Jonathan "Geenz" Goodman
2025-02-24#3332 Remake glyph count into cache generationAndrey Kleshchev
1. Cover reset with 'generation' 2. Fix lapse of judgement with mLastFontGlyphCount, it should have been saved before render(), not after
2025-02-23Quick fix for null pointer in LLDrawPoolWaterJonathan "Geenz" Goodman
2025-02-23CleanupJonathan "Geenz" Goodman
2025-02-22Accidental double linearization, try roughness ^2 for water punctual light.Jonathan "Geenz" Goodman
2025-02-22viewer-private#398 Fix constant asset rerequestsAndrey Kleshchev
2025-02-19Merge branch 'develop' into release/2024.12-ForeverFPSJonathan "Geenz" Goodman
2025-02-19Merge pull request #3587 from secondlife/geenz/cla-whitelist-updateJonathan "Geenz" Goodman
CLA wants a comma separated string.
2025-02-19Merge branch 'develop' into geenz/cla-whitelist-updateJonathan "Geenz" Goodman
2025-02-19CLA wants a comma separated string.Jonathan "Geenz" Goodman
2025-02-19Merge pull request #3586 from secondlife/geenz/cla-whitelist-updateJonathan "Geenz" Goodman
Update allow list for CLA.
2025-02-19Update allow list for CLA.Jonathan "Geenz" Goodman
2025-02-19#3581 #3563 Fix callback deletion not workingAndrey Kleshchev
2025-02-18#3511 fix for PBR skies being too bright on Low GraphicsMaxim Nikolenko
2025-02-18#3557 Waves not applying without Transparent WaterAndrey Kleshchev
2025-02-15#2639 GPU test twice to fix misreported bandwidth (#3558)Andrey Kleshchev
A workaround, hopefully temporary. First test returns half the throughput, do two tests. May be caused by driver, may be some 'energy saving', will need to be checked later. It was working the same way prior to ExtraFPS, but viewer was running an extra CPU test.
2025-02-14Switch from GL_RGB16F to GL_R11F_G11F_B10F for probes (#3562)Jonathan "Geenz" Goodman
* #3561 Switch from GL_RGB16F to GL_R11F_G11F_B10F for reflection probes to help reduce memory bandwidth and VRAM pressure.
2025-02-13Merge pull request #3549 from secondlife/marchcat/foreverfps-xcode-16Andrey Lihatskiy
Update ForeverFPS build to use macos15/xcode16.1
2025-02-13Follow-up fixes from developAndrey Lihatskiy
2025-02-13Bump macos runner to os version 15 with xcode 16.1Andrey Lihatskiy
2025-02-13Fix xcode16 build errorsAndrey Lihatskiy
2025-02-13viewer-private#394 Ensure correct item id is used on macMaxim Nikolenko
2025-02-12viewer-private#396 Use benefits for picks countAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 07:36:25 +0000