Age | Commit message (Collapse) | Author |
|
secondlife/viewer#1883: Terrain paint client prototype WIP code check-in
|
|
(#2518, #2519)"
This reverts commit 6af471482d6801530915c1c9ae4bdf788af52eae.
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#2519)
|
|
|
|
|
|
unsupported (#2491)
fixes secondlife/viewer#1856
|
|
|
|
fix secondlife/viewer#1856
|
|
|
|
|
|
secondlife/viewer#1883: Local-only PBR terrain paintmap with developer tools
|
|
|
|
|
|
|
|
|
|
|
|
|
|
release/2024.06-atlasaurus
# Conflicts:
# autobuild.xml
# indra/newview/llvoicechannel.cpp
|
|
|
|
# Conflicts:
# indra/newview/llvoicechannel.cpp
|
|
|
|
|
|
|
|
|
|
to pick up Featurettes promotion + Brad's GitHub Windows build workaround.
|
|
ScopedRegistrarHelper
|
|
|
|
|
|
|
|
* #1535 Image loading/saving support in boost::json driven GLTF parser
* #1536 GLB Support in boost::json drvien GLTF parser
|
|
brad/merge-maint-a-to-dev
|