aebfdfa48b
Added git-blame-ignore entry for whitespace change
2024-06-18 11:57:54 -07:00
863c541ce0
Fix whitespace for pre-commit hooks
2024-06-18 11:57:11 -07:00
6393e88ca4
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
2024-06-18 11:55:30 -07:00
4e593dcded
Merge pull request #1797 from secondlife/release/maint-a
...
merge release/maint-a into develop and close maint-a
2024-06-18 11:48:37 -07:00
7342ebf43a
Follow-up improvements of 810219d3bf
2024-06-18 21:41:00 +03:00
810219d3bf
jira-archive-internal#67837 Fix LLDir::getScrubbedFileName
2024-06-18 21:00:08 +03:00
3da16d1899
Attempt to fix tag-release workflow by moving conditional secrets usage into env
2024-06-17 18:38:00 -07:00
352dff6830
Attempt to fix workflow syntax in new tag-release workflow ( #1792 )
2024-06-17 18:32:24 -07:00
ee5d1102c3
Merge pull request #1763 from secondlife/brad/tag-nightly
...
Setting up scheduled and manually dispatched releases.
2024-06-17 18:02:11 -07:00
dd64c39d64
Pass through input channel to select the tag channel name
2024-06-17 17:55:29 -07:00
b9a8b3b240
Update naming and add options to tag-release workflow_dispatch.
2024-06-17 17:43:02 -07:00
84a221e7dd
Renamed tag-nightly.yaml to generalize it to other tags when using workflow_dispatch
2024-06-17 17:41:53 -07:00
d0dfffe659
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
2024-06-17 16:02:57 -07:00
ea83746cda
Remove orphaned VRAM handling code
2024-06-17 19:04:41 +03:00
e22408a27e
make Second Life Develop be recognized as a Beta channel
2024-06-14 15:08:50 -07:00
375555012f
1736 audit texture image unit usage on os x ( #1739 )
...
* #1736 Remove some unused samplers from glsl files and refactor shader manager to assume 16 texture image units and 4 indexed texture units all the time.
2024-06-14 17:06:07 -05:00
29130e16bc
Merge pull request #1747 from megapahit/beacon
...
Fixes secondlife/viewer#999 lltracker beacon performance issue
2024-06-14 13:40:29 -07:00
f4eae44067
Fix for warnings/errors after Visual Studio update ( #1775 )
2024-06-14 13:47:19 -05:00
0e1e1685d4
Skip the actual tag update step gracefully until we have proper tokens set up
2024-06-13 18:14:21 -07:00
b9f287815a
Add new viewer_channel detection for develop branch
2024-06-13 17:55:05 -07:00
41cb778fb0
Initial work setting up scheduled releases for develop branch.
2024-06-13 17:41:17 -07:00
5e60392c27
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-13 14:59:28 -07:00
0ed3483b33
Merge pull request #1743 from secondlife/v-1475
...
secondlife/viewer#1475 : Fix Terrain tab controls no longer disabled when insufficient permissions
2024-06-13 12:51:39 -07:00
74765c1573
secondlife/viewer#907 : Remove unused setting
2024-06-13 12:49:51 -07:00
fcf9af42fa
secondlife/viewer#907 : Review feedback
2024-06-13 12:49:48 -07:00
fa4e463ba8
secondlife/viewer#1744 : Fix missing LSL constant INVENTORY_SETTING in keywords_lsl_default.xml
2024-06-13 09:11:40 -07:00
8861264d8d
secondlife/viewer#1475 : Fix Terrain tab controls no longer disabled when insufficient permissions
2024-06-13 09:11:39 -07:00
219448127a
lltracker::drawbeacon() rewritted for better performance
...
this is a better implementation of the drawBeacon() function compared to the previous patch
2024-06-13 08:18:15 +02:00
bb55d25d47
fixed tracker beacon performance issue on apple silicon macs
...
tracking beacon was causing extreme lag on apple silicon macs
2024-06-13 08:18:15 +02:00
162c87a0a8
Merge pull request #1746 from Ansariel/develop
...
Fix a few merge issues
2024-06-12 18:03:31 -07:00
15b3c9f164
Fix a few merge issues
2024-06-13 02:22:03 +02:00
100ebbab24
Merge pull request #1745 from secondlife/project/gltf_development
...
move project/gltf development to develop
2024-06-12 17:04:34 -07:00
ae74ca8069
Add whitespace change to .git-blame-ignore-revs for pr #1723
2024-06-12 14:39:32 -07:00
071e464155
Merge pull request #1723 from secondlife/brad/maint-a-merge-to-gltf-dev
...
maint a merge to gltf dev
2024-06-12 14:33:01 -07:00
8444cd9562
Fix whitespace pre-commit hook failures
2024-06-12 13:51:21 -07:00
8729c0d2c4
Fixup more signed/unsigned warnings after merge.
2024-06-12 12:53:45 -07:00
d12c897bfc
Merge remote-tracking branch 'origin/project/gltf_development' into brad/maint-a-merge-to-gltf-dev
...
# Conflicts:
# indra/newview/gltf/primitive.cpp
2024-06-12 10:31:27 -07:00
f0de2ba634
Merge pull request #1724 from secondlife/v-1475
...
secondlife/viewer#1475 : PBR Terrain texture transform UI: Second pass
2024-06-12 09:25:28 -07:00
57ade10b70
viewer#1672 Crash at setDefaultFOV
...
Some things can make a copy of camera, like LLViewerWindow::cubeSnapshot
so need to store and clean up the connection
2024-06-12 18:12:35 +03:00
14c89a62c0
viewer#1731 Crash at LLPipeline::markVisible
...
mDrawable pointer had junk in it
2024-06-12 18:12:35 +03:00
718189085a
viewer#1730 Crash in LLFetchedGLTFMaterial::bind
2024-06-12 18:12:35 +03:00
f1a756bd76
viewer#1728 Crash in LLViewerRegion::probeCache
2024-06-12 18:12:35 +03:00
148786999d
viewer#1698 Uniform being out of range shouldn't crash viewer
2024-06-12 18:12:35 +03:00
be656055c1
viewer#1692 Crash at LLVOVolume::getReflectionProbeIsBox()
2024-06-12 18:12:35 +03:00
23902789dd
viewer#1733 UI overlap in advanced settings
2024-06-12 16:49:48 +03:00
0f3c3563b0
Merge pull request #1726 from secondlife/roxie/webrtc-voice
...
Merge from main.
2024-06-11 23:18:54 -07:00
ed34782283
Merge branch 'main' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-11 18:43:34 -07:00
d2145142d9
secondlife/viewer#1475 : PBR Terrain texture transform UI: Second pass
2024-06-11 18:09:47 -07:00
9775d7ea10
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
2024-06-11 17:42:17 -07:00
a7b0f93911
Fixed signed/unsigned warnings after they got enabled in the maint-A merge
2024-06-11 15:39:48 -07:00
Brad Linden