Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
script
|
|
(cherry picked from commit 82d713782529074b03720833038cb0df2b8bcffd)
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterimagepreview.cpp
|
|
|
|
|
|
|
|
following promotion of secondlife/viewer #705: Maintenance X
|
|
Maintenance X
|
|
brad/mac shader fix
|
|
not allowed'
|
|
project/gltf_development
|
|
Fix broken merge and BOOL/bool issues
|
|
|
|
project/gltf_development
|
|
secondlife/viewer#907: Local PBR terrain texture transform in advanced settings
|
|
|
|
|
|
This reverts commit 4329e95379173a304e91dd0b7513e936aeded380.
|
|
|
|
|
|
Caused by a conflict between the LLGLTFMaterial::getHash fix, and an improvement in LLGLTFMaterial field ordering for platform-dependent memory reduction.
|
|
|
|
This reverts commit a865d423974ea06dffa47798c81e98e7570b02ec.
Reason for revert: viewer#1420, reverting to not hold maint-A (is deepCopy not full?)
|
|
|
|
viewer#1420 Fixed names not showing in Chat
|
|
Marketplace is not visible outside of own floater and that floater will
do an extra warning when deleting listings that have additional data.
|
|
# Conflicts:
# autobuild.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Update to S3-published GHA build of slvoice.
|
|
Instead of making LLEventPumps an LLHandleProvider, and storing an
LLHandle<LLEventPumps> in each LLEventPump instance, just make ~LLEventPump()
query LLEventPumps::instanceExists() before calling instance().
|
|
|
|
|
|
Rename LL::Timers::scheduleRepeating() to scheduleEvery().
|
|
(cherry picked from commit dc0b3aed4782e4e4835fd6b9d59d1d70b78be4a7)
|
|
https://github.com/secondlife/autobuild/issues/46
Also remove temporary `continue-on-error` setting.
|
|
|
|
Copy xml files to scripts/lua; make Lua debug floater resizable
|