Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
|
|
|
|
|
|
brad/SL-17116-material-messaging
|
|
|
|
|
|
|
|
brad/SL-17116-material-messaging
|
|
Materials
|
|
|
|
|
|
|
|
into other types of textures
|
|
updated
|
|
after copying texture from the object with texture with no transfer permission
|
|
|
|
|
|
Mostly for the sake of MAC. setVolume(0) doesn't work on MAC which resulted in invisible media playing in background when editor was open.
|
|
|
|
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelvolume.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
You need to own texture in inventory to be able to copy it
|
|
|
|
|
|
|
|
|
|
This reverts commit 1e1707d532560583744bb877adfed11864f2db31.
|
|
|
|
|
|
|
|
that use different face counts.
|
|
|
|
mapping mode
|
|
|
|
|
|
pasted from the clipboard
|
|
copied to clipboard from no-copy or no-transfer objects
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|