Merge branch 'master' into DRTVWR-460
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
No related branches found
No related tags found
Showing
- doc/contributions.txt 12 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/Atmosphere.cmake 5 additions, 0 deletionsindra/cmake/Atmosphere.cmake
- indra/llappearance/llavatarappearance.cpp 9 additions, 10 deletionsindra/llappearance/llavatarappearance.cpp
- indra/llappearance/llavatarjoint.cpp 13 additions, 13 deletionsindra/llappearance/llavatarjoint.cpp
- indra/llappearance/llavatarjointmesh.cpp 1 addition, 1 deletionindra/llappearance/llavatarjointmesh.cpp
- indra/llappearance/lldriverparam.cpp 1 addition, 1 deletionindra/llappearance/lldriverparam.cpp
- indra/llappearance/llpolymorph.cpp 2 additions, 2 deletionsindra/llappearance/llpolymorph.cpp
- indra/llappearance/llpolyskeletaldistortion.cpp 1 addition, 1 deletionindra/llappearance/llpolyskeletaldistortion.cpp
- indra/llappearance/lltexlayer.cpp 76 additions, 29 deletionsindra/llappearance/lltexlayer.cpp
- indra/llappearance/lltexlayer.h 12 additions, 12 deletionsindra/llappearance/lltexlayer.h
- indra/llappearance/llwearabletype.cpp 1 addition, 1 deletionindra/llappearance/llwearabletype.cpp
- indra/llappearance/llwearabletype.h 1 addition, 10 deletionsindra/llappearance/llwearabletype.h
- indra/llcharacter/llcharacter.cpp 1 addition, 1 deletionindra/llcharacter/llcharacter.cpp
- indra/llcharacter/lljoint.cpp 14 additions, 13 deletionsindra/llcharacter/lljoint.cpp
- indra/llcharacter/lljoint.h 2 additions, 2 deletionsindra/llcharacter/lljoint.h
- indra/llcharacter/llkeyframemotion.cpp 1 addition, 1 deletionindra/llcharacter/llkeyframemotion.cpp
- indra/llcommon/indra_constants.cpp 0 additions, 1 deletionindra/llcommon/indra_constants.cpp
- indra/llcommon/indra_constants.h 0 additions, 1 deletionindra/llcommon/indra_constants.h
- indra/llcommon/llassettype.cpp 7 additions, 12 deletionsindra/llcommon/llassettype.cpp
- indra/llcommon/llassettype.h 14 additions, 5 deletionsindra/llcommon/llassettype.h
Loading
Please register or sign in to comment