| Age | Commit message (Collapse) | Author | 
|---|
|  | webrtc-voice merge to develop | 
|  |  | 
|  |  | 
|  | brad/webrtc-voice-develop | 
|  | in case user provided a texture later, after seeing a 'missing texture'
error. | 
|  |  | 
|  | [WebRTC] Fix crash issue when echo cancellation is enabled/disabled. | 
|  | 'origin/1771-mesh-objects-do-not-display-until-you-walk-directly-over-them' into develop
resolve known conflicts early.
 # Conflicts:
 #	indra/newview/llvocache.cpp | 
|  | 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. | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | merge release/maint-a into develop and close maint-a | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | Setting up scheduled and manually dispatched releases. | 
|  |  | 
|  |  | 
|  | workflow_dispatch | 
|  |  | 
|  |  | 
|  |  | 
|  | * #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. | 
|  | Fixes secondlife/viewer#999 lltracker beacon performance issue | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | secondlife/viewer#1475: Fix Terrain tab controls no longer disabled when insufficient permissions | 
|  |  | 
|  |  | 
|  | keywords_lsl_default.xml | 
|  | insufficient permissions | 
|  | this is a better implementation of the drawBeacon() function compared to the previous patch | 
|  | tracking beacon was causing extreme lag on apple silicon macs | 
|  | Fix a few merge issues | 
|  |  | 
|  | move project/gltf development to develop | 
|  |  | 
|  | maint a merge to gltf dev | 
|  |  | 
|  |  | 
|  | brad/maint-a-merge-to-gltf-dev
 # Conflicts:
 #	indra/newview/gltf/primitive.cpp |