684bc1d1ea
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
2024-06-21 19:46:51 +02:00
e33d2fad5f
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-gltf-development
...
# Conflicts:
# indra/newview/llimview.h
# indra/newview/llpanelpeople.h
# indra/newview/llpanelvoicedevicesettings.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.cpp
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/llvoicevivox.h
2024-06-21 19:10:44 +02:00
9fb9e8f33c
viewer#1821 Crash at getSessionID()
2024-06-21 19:31:46 +03:00
e4fd1bd71e
viewer#1808 Use bugsplat's setAttribute for app state
2024-06-21 11:46:25 +03:00
68963019cd
Merge pull request #1791 from secondlife/brad/webrtc-voice-develop
...
webrtc-voice merge to develop
2024-06-20 16:02:10 -07:00
a52391d582
Fixed incomplete merge in message_template.msg.sha1
2024-06-20 14:40:14 -07:00
d8cbc8a0fd
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
2024-06-20 14:29:54 -07:00
c686be5b0d
Merge remote-tracking branch 'origin/release/webrtc-voice' into brad/webrtc-voice-develop
2024-06-20 14:29:46 -07:00
2515f422cf
viewer-private#247 Retry loading missing textures for model upload
...
in case user provided a texture later, after seeing a 'missing texture'
error.
2024-06-20 23:23:05 +03:00
5c9d985b92
triage#59 Properly hide particles if 'friends only'
2024-06-20 10:46:40 +03:00
d8fdf5acf8
Merge pull request #1801 from secondlife/roxie/webrtc-voice-1732
...
[WebRTC] Fix crash issue when echo cancellation is enabled/disabled.
2024-06-18 17:45:19 -07:00
5b13c53e31
Merge remote-tracking branch 'origin/1771-mesh-objects-do-not-display-until-you-walk-directly-over-them' into develop
...
resolve known conflicts early.
# Conflicts:
# indra/newview/llvocache.cpp
2024-06-18 17:35:32 -07:00
0799f799e6
Fix crash issue when echo cancellation is enabled/disabled.
...
New webrtc library fixes an assert in webrtc when echo cancellation is enabled or
disabled.
Also, fix an issue where disabling media grays out noise cancellation.
2024-06-18 15:40:12 -07:00
c910fdda2b
#1771 Fix for objects disappearing and not reappearing until LoD switch
2024-06-18 17:17:37 -05:00
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
050d2fefab
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/gltf/primitive.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
2024-06-13 03:21:12 +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
c29a661b22
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-13 01:54:18 +02: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
Ansariel