19347f7094
Fix merge issues:
...
* Restore changes from 21947778ba37586189491eeecfa1a8b9633c17e3f660f1f0fdb9633c17e398f7d73d4623729442aa
2025-04-10 23:51:36 +03:00
d53183557d
Post-merge cleanup: llvoavatar.cpp
2025-04-10 23:34:10 +03:00
28f45962fd
Post-merge cleanup: llwindowwin32.cpp
2025-04-10 23:14:53 +03:00
e66637ff33
Fix missing inventory unlock
2025-04-10 23:14:02 +03:00
d34e323b9e
macos buildfix
2025-04-10 09:14:13 +03:00
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
3f648945b0
Fix pre-commit error
2025-04-10 08:00:43 +03:00
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
2813097aff
Merge commit '7947ce3' into marchcat/maint-c/maint-c-restore
...
# Conflicts:
# indra/newview/llappviewer.cpp
2025-04-10 01:05:12 +03:00
b7dd677933
Add discord channel for open source discussion.
2025-04-03 12:58:26 -04:00
e6927d8a07
Merge pull request #3304 from secondlife/release/2024.12-ForeverFPS
...
2024.12 ForeverFPS
2025-03-06 15:23:54 -05:00
42ceac9695
Revert "#2639 GPU test twice to fix misreported bandwidth ( #3558 )"
...
This reverts commit b0d80552b3
2025-02-26 20:14:39 +02:00
bc02334284
#3270 use TELEPORT_LOCAL when teleporting within a region via landmark
2025-02-26 15:35:04 +02:00
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
ae7658de24
Mitigation for #3331
2025-02-25 08:50:25 -05:00
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
62cf4781af
Merge branch 'release/2024.12-ForeverFPS' into geenz/eep-setting-fixes
2025-02-24 17:19:55 -05:00
3dde346975
Backout minimal+ change.
2025-02-24 17:19:41 -05:00
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
892628c7f3
Quick fix for null pointer in LLDrawPoolWater
2025-02-23 12:54:50 -05:00
d2fd2f49e3
Cleanup
2025-02-23 12:20:11 -05:00
3e2da8e584
Accidental double linearization, try roughness ^2 for water punctual light.
2025-02-22 14:17:43 -05:00
b2e3159ce7
viewer-private#398 Fix constant asset rerequests
2025-02-22 13:02:52 +02:00
941c002877
Merge branch 'develop' into release/2024.12-ForeverFPS
2025-02-19 15:34:58 -05:00
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
0493b562db
Merge branch 'develop' into geenz/cla-whitelist-update
2025-02-19 15:15:30 -05:00
1fe6031a12
CLA wants a comma separated string.
2025-02-19 15:14:50 -05:00
789edfcab7
Merge pull request #3586 from secondlife/geenz/cla-whitelist-update
...
Update allow list for CLA.
2025-02-19 15:04:03 -05:00
a1121eb8c0
Update allow list for CLA.
2025-02-19 15:00:26 -05:00
41368a94b7
#3581 #3563 Fix callback deletion not working
2025-02-19 20:56:58 +02:00
8114850e94
#3511 fix for PBR skies being too bright on Low Graphics
2025-02-18 11:33:32 +02:00
9b0c167b84
#3557 Waves not applying without Transparent Water
2025-02-18 10:26:57 +02:00
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
c60061b504
Switch from GL_RGB16F to GL_R11F_G11F_B10F for probes ( #3562 )
...
* #3561 Switch from GL_RGB16F to GL_R11F_G11F_B10F for reflection probes to help reduce memory bandwidth and VRAM pressure.
2025-02-14 13:16:35 -05:00
8f8453c3e8
Merge pull request #3549 from secondlife/marchcat/foreverfps-xcode-16
...
Update ForeverFPS build to use macos15/xcode16.1
2025-02-13 19:52:12 +02:00
d74b30b4ec
Follow-up fixes from develop
2025-02-13 18:00:55 +02:00
34c3eed88a
Bump macos runner to os version 15 with xcode 16.1
2025-02-13 17:40:40 +02:00
ddbe1ff981
Fix xcode16 build errors
2025-02-13 17:30:08 +02:00
0679cbdec8
viewer-private#394 Ensure correct item id is used on mac
2025-02-13 16:10:49 +02:00
646d0779bd
viewer-private#396 Use benefits for picks count
2025-02-12 19:12:12 +02:00
bec382698b
viewer-private#395 Fix voice not reconnecting
2025-02-12 17:49:46 +02:00
09c60de43c
#3210 Fix for "Texture will be downscaled" log message happening too often
2025-02-12 17:09:44 +02:00
e708d69fb0
#3332 Fix buffers not accounting for dynamic cache values
...
And fix previous lapse of judgement with GLYPH_BATCH_SIZE
2025-02-11 23:59:42 +02:00
d450295cf5
Additional water fixes and tweaks. ( #3524 )
...
* Incorporation of feedback for #3456
2025-02-11 13:49:24 -05:00
6a78b5b43c
#3332 Font issues with multy-byte and multy-glyps characters
2025-02-10 23:18:33 +02:00
bc84cb02a2
#3332 Issues with text buffer updates
2025-02-10 23:18:33 +02:00
3a251b1b9e
#3332 Switching screens can break text rendering
2025-02-07 23:27:30 +02:00
1924241f04
viewer-private#375 add more logging in attempt to get more info
2025-02-07 19:00:20 +02:00
95106e203c
#3505 Fix updateMenu() being called too frequently on fetch callback
...
The actual problem is fetch dumping thousands of callbacks, but this
should mitigate the problem
2025-02-07 18:34:04 +02:00
046ec79d22
#3505 Make inventory run less content checks
2025-02-07 18:34:04 +02:00
Ansariel