-
- Downloads
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
No related branches found
No related tags found
Showing
- .gitignore 13 additions, 0 deletions.gitignore
- autobuild.xml 162 additions, 10 deletionsautobuild.xml
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/cmake/00-Common.cmake 1 addition, 0 deletionsindra/cmake/00-Common.cmake
- indra/cmake/CMakeLists.txt 1 addition, 0 deletionsindra/cmake/CMakeLists.txt
- indra/cmake/FMODSTUDIO.cmake 1 addition, 1 deletionindra/cmake/FMODSTUDIO.cmake
- indra/cmake/GLEXT.cmake 2 additions, 4 deletionsindra/cmake/GLEXT.cmake
- indra/cmake/LLAddBuildTest.cmake 14 additions, 0 deletionsindra/cmake/LLAddBuildTest.cmake
- indra/cmake/LLMath.cmake 3 additions, 0 deletionsindra/cmake/LLMath.cmake
- indra/cmake/Mikktspace.cmake 6 additions, 0 deletionsindra/cmake/Mikktspace.cmake
- indra/cmake/TinyGLTF.cmake 7 additions, 0 deletionsindra/cmake/TinyGLTF.cmake
- indra/cmake/Tracy.cmake 3 additions, 2 deletionsindra/cmake/Tracy.cmake
- indra/cmake/Variables.cmake 1 addition, 1 deletionindra/cmake/Variables.cmake
- indra/cmake/VulkanGltf.cmake 5 additions, 0 deletionsindra/cmake/VulkanGltf.cmake
- indra/llappearance/lltexlayer.cpp 8 additions, 14 deletionsindra/llappearance/lltexlayer.cpp
- indra/llappearance/lltexlayerparams.cpp 1 addition, 3 deletionsindra/llappearance/lltexlayerparams.cpp
- indra/llappearance/lltexlayerparams.h 1 addition, 1 deletionindra/llappearance/lltexlayerparams.h
- indra/llaudio/llaudiodecodemgr.cpp 29 additions, 32 deletionsindra/llaudio/llaudiodecodemgr.cpp
- indra/llcommon/CMakeLists.txt 4 additions, 0 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/commoncontrol.cpp 106 additions, 0 deletionsindra/llcommon/commoncontrol.cpp
Loading
Please register or sign in to comment