Commit Graph

52192 Commits (1f17536cc8b0922ade8c68046ee1665ccec817d9)

Author SHA1 Message Date
Andrey Lihatskiy 1f17536cc8 #3900 Skip checking AFK status during startup states 2025-04-13 01:43:36 +03:00
Andrey Kleshchev 1dacabe780 #3379 Crash on gIdleCallbacks iteration 2025-04-12 10:16:42 +03:00
Andrey Lihatskiy cfad42bea9 Refactor LLWindowWin32::LLWindowWin32Thread::wakeAndDestroy()
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-12 06:20:38 +03:00
Maxim Nikolenko dab8b9c623 #3383 'InventoryAddAttachmentBehavior' setting should affect inventory panel in List view; update persistence of new settings 2025-04-11 00:33:13 +03:00
Maxim Nikolenko 154d15d42d #3403 fix Favorited worn outfit not coloured in My Outfits tab 2025-04-11 00:33:01 +03:00
Maxim Nikolenko 0c9f6f50ef #3394 Fix colour change not applied to favourites in Outfit Gallery 2025-04-11 00:32:51 +03:00
Maxim Nikolenko 2d11e10a90 #3377 Select 'All items' tab when creating a folder via '+' button 2025-04-11 00:32:40 +03:00
Andrey Kleshchev 3daf08696e #3374 Fix item reparenting moving containing folder 2025-04-11 00:32:29 +03:00
Andrey Kleshchev b1fa03e224 #3374 LLFolderViewFolder::updateHasFavorites 2025-04-11 00:32:15 +03:00
Maxim Nikolenko eb0ca41984 #3373 Rename "My Favorites" system folder to "Favorites Bar" 2025-04-11 00:32:05 +03:00
Maxim Nikolenko 1dd0059f89 #3354 adjust controls positions to avoid overlapping
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
2025-04-11 00:31:48 +03:00
Andrey Kleshchev f9503bdf8c #3353 Fix favorited items not being readded on parent removal 2025-04-11 00:29:35 +03:00
Andrey Lihatskiy 7bffdd74af #3367 Move Maximum # of animated avatars slider in Graphics 2025-04-11 00:29:10 +03:00
Andrey Kleshchev 9117a37c3d Give control over thread queue's automatic shutdown 2025-04-11 00:13:19 +03:00
Ansariel Hiller f52b281f00 Apply changes from 55f2103adc to LLFolderViewItem::drawFavoriteIcon (#2867)
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
2025-04-11 00:09:46 +03:00
Ansariel bab3bc4ebd Fix more merge issues:
* Re-apply changes from a620e58dac
* Fix duplicate code resulting from 826236f1bc

# Conflicts:
#	indra/llwindow/llwindowwin32.cpp
2025-04-11 00:07:38 +03:00
Ansariel a510a1da00 Convert BOOL to bool
# Conflicts:
#	indra/newview/llagent.cpp
2025-04-10 23:54:36 +03:00
Ansariel 19347f7094 Fix merge issues:
* Restore changes from 21947778ba to llwindow/llwindowwin32.cpp
* Restore changes from 3758618949 to newview/llinspecttexture.cpp
* Fix apparent merge error in LLInventoryPanel::itemChanged
* Restore changes from 1eeecfa1a8 in newview/llpaneloutfitsinventory.h
* Restore changes from b9633c17e3 in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp
* Restore changes from f660f1f0fd in newview/llviewertexture.cpp
* Restore changes from b9633c17e3 & 98f7d73d46 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp
* Replace changes from 23729442aa 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-10 23:51:36 +03:00
Andrey Lihatskiy d53183557d Post-merge cleanup: llvoavatar.cpp 2025-04-10 23:34:10 +03:00
Andrey Lihatskiy 28f45962fd Post-merge cleanup: llwindowwin32.cpp 2025-04-10 23:14:53 +03:00
Andrey Kleshchev e66637ff33 Fix missing inventory unlock 2025-04-10 23:14:02 +03:00
Andrey Lihatskiy d34e323b9e macos buildfix 2025-04-10 09:14:13 +03:00
Jonathan "Geenz" Goodman 32e894b40c Switch to smaller runners (#3722)
* Switch to smaller runners

* Make the runner conditional based upon a specific tag.

Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
2025-04-10 08:06:22 +03:00
Andrey Lihatskiy 3f648945b0 Fix pre-commit error 2025-04-10 08:00:43 +03:00
Andrey Lihatskiy 5d7a5001b4 Merge commit '9e24b30' into marchcat/maint-c/restore
# 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-10 06:01:50 +03:00
Andrey Lihatskiy 2813097aff Merge commit '7947ce3' into marchcat/maint-c/maint-c-restore
# Conflicts:
#	indra/newview/llappviewer.cpp
2025-04-10 01:05:12 +03:00
Jonathan "Geenz" Goodman b7dd677933
Add discord channel for open source discussion. 2025-04-03 12:58:26 -04:00
Jonathan "Geenz" Goodman e6927d8a07
Merge pull request #3304 from secondlife/release/2024.12-ForeverFPS
2024.12 ForeverFPS
2025-03-06 15:23:54 -05:00
Andrey Kleshchev 42ceac9695 Revert "#2639 GPU test twice to fix misreported bandwidth (#3558)"
This reverts commit b0d80552b3.
2025-02-26 20:14:39 +02:00
Maxim Nikolenko bc02334284
#3270 use TELEPORT_LOCAL when teleporting within a region via landmark 2025-02-26 15:35:04 +02:00
Jonathan "Geenz" Goodman ca079bc149
Merge pull request #3610 from secondlife/geenz/mirrors-enabled-fix
#3331 - Mirrors no longer function on relog
2025-02-25 09:07:45 -05:00
Jonathan "Geenz" Goodman ae7658de24 Mitigation for #3331 2025-02-25 08:50:25 -05:00
Jonathan "Geenz" Goodman 5b425eb9dc
Merge pull request #3602 from secondlife/geenz/eep-setting-fixes
- #3594 Adjustments to mitigate sun reflection being too narrow.
2025-02-24 17:20:48 -05:00
Jonathan "Geenz" Goodman 62cf4781af
Merge branch 'release/2024.12-ForeverFPS' into geenz/eep-setting-fixes 2025-02-24 17:19:55 -05:00
Jonathan "Geenz" Goodman 3dde346975 Backout minimal+ change. 2025-02-24 17:19:41 -05:00
Andrey Kleshchev 5b968b7209 #3332 Remake glyph count into cache generation
1. Cover reset with 'generation'
2. Fix lapse of judgement with mLastFontGlyphCount, it should have been
saved before render(), not after
2025-02-24 19:31:16 +02:00
Jonathan "Geenz" Goodman 892628c7f3 Quick fix for null pointer in LLDrawPoolWater 2025-02-23 12:54:50 -05:00
Jonathan "Geenz" Goodman d2fd2f49e3 Cleanup 2025-02-23 12:20:11 -05:00
Jonathan "Geenz" Goodman 3e2da8e584 Accidental double linearization, try roughness ^2 for water punctual light. 2025-02-22 14:17:43 -05:00
Andrey Kleshchev b2e3159ce7 viewer-private#398 Fix constant asset rerequests 2025-02-22 13:02:52 +02:00
Jonathan "Geenz" Goodman 941c002877 Merge branch 'develop' into release/2024.12-ForeverFPS 2025-02-19 15:34:58 -05:00
Jonathan "Geenz" Goodman 20dfc94c5d
Merge pull request #3587 from secondlife/geenz/cla-whitelist-update
CLA wants a comma separated string.
2025-02-19 15:16:13 -05:00
Jonathan "Geenz" Goodman 0493b562db
Merge branch 'develop' into geenz/cla-whitelist-update 2025-02-19 15:15:30 -05:00
Jonathan "Geenz" Goodman 1fe6031a12 CLA wants a comma separated string. 2025-02-19 15:14:50 -05:00
Jonathan "Geenz" Goodman 789edfcab7
Merge pull request #3586 from secondlife/geenz/cla-whitelist-update
Update allow list for CLA.
2025-02-19 15:04:03 -05:00
Jonathan "Geenz" Goodman a1121eb8c0 Update allow list for CLA. 2025-02-19 15:00:26 -05:00
Andrey Kleshchev 41368a94b7 #3581 #3563 Fix callback deletion not working 2025-02-19 20:56:58 +02:00
Maxim Nikolenko 8114850e94
#3511 fix for PBR skies being too bright on Low Graphics 2025-02-18 11:33:32 +02:00
Andrey Kleshchev 9b0c167b84 #3557 Waves not applying without Transparent Water 2025-02-18 10:26:57 +02:00
Andrey Kleshchev b0d80552b3
#2639 GPU test twice to fix misreported bandwidth (#3558)
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-15 02:51:22 -05:00