Age | Commit message (Collapse) | Author |
|
# Conflicts:
# autobuild.xml
# indra/cmake/ConfigurePkgConfig.cmake
# indra/cmake/ICU4C.cmake
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
# indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/lloutfitslist.cpp
|
|
LF, and trim trailing whitespaces as needed
|
|
Co-authored-by: AiraYumi <aira.youme@airanyumi.net>
|
|
|
|
|
|
UIImgInvisibleUUID doesn't exist
Default normal for material is 'null'
|
|
|
|
|
|
|
|
and fixed diffuse alpha
|
|
some cases
|
|
|
|
attached object
|
|
|
|
inventory rather than object inventory
|
|
Material
|
|
|
|
numbered face is selected
|
|
attachments
1. Texture picker now updates filter's permissions based on selection
2. Various panels now properly check permissions
|
|
|
|
not allowed
|
|
|
|
|
|
|
|
re-enabling after object inventory load
|
|
|
|
inventory. Check perms, keep perms.
|
|
|
|
no-transfer
|
|
|
|
state
|
|
values
|
|
|
|
DRTVWR-559
|
|
|
|
|
|
clear that those buttons are inoperable until you remove the PBR material.
|
|
|
|
in more sensible way. Ignore "Lock repeat" in PBR mode as it's redundant
|
|
material radio
|
|
|
|
SL-19002: Handle edge case in client networking which could cause material ID and overrides to become out-of-sync
|
|
call queueApply/queueModify
|
|
|
|
|
|
asserts to allow non-default transform overrides.
|
|
When in PBR 'mode', defaulted texture drops to diffuse channel
|
|
|
|
|
|
GLTF material
|