Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360
# Conflicts: # indra/newview/app_settings/settings.xml
No related branches found
No related tags found
Showing
- doc/contributions.txt 7 additions, 0 deletionsdoc/contributions.txt
- indra/CMakeLists.txt 1 addition, 1 deletionindra/CMakeLists.txt
- indra/cmake/00-Common.cmake 1 addition, 2 deletionsindra/cmake/00-Common.cmake
- indra/cmake/CMakeLists.txt 1 addition, 1 deletionindra/cmake/CMakeLists.txt
- indra/cmake/LLFileSystem.cmake 7 additions, 0 deletionsindra/cmake/LLFileSystem.cmake
- indra/cmake/LLVFS.cmake 0 additions, 7 deletionsindra/cmake/LLVFS.cmake
- indra/integration_tests/llimage_libtest/CMakeLists.txt 3 additions, 3 deletionsindra/integration_tests/llimage_libtest/CMakeLists.txt
- indra/integration_tests/llui_libtest/CMakeLists.txt 2 additions, 2 deletionsindra/integration_tests/llui_libtest/CMakeLists.txt
- indra/linux_crash_logger/CMakeLists.txt 3 additions, 4 deletionsindra/linux_crash_logger/CMakeLists.txt
- indra/llappearance/CMakeLists.txt 4 additions, 16 deletionsindra/llappearance/CMakeLists.txt
- indra/llappearance/lltexlayer.cpp 0 additions, 2 deletionsindra/llappearance/lltexlayer.cpp
- indra/llaudio/CMakeLists.txt 3 additions, 3 deletionsindra/llaudio/CMakeLists.txt
- indra/llaudio/llaudiodecodemgr.cpp 23 additions, 35 deletionsindra/llaudio/llaudiodecodemgr.cpp
- indra/llaudio/llaudiodecodemgr.h 0 additions, 1 deletionindra/llaudio/llaudiodecodemgr.h
- indra/llaudio/llaudioengine.cpp 5 additions, 10 deletionsindra/llaudio/llaudioengine.cpp
- indra/llaudio/llaudioengine.h 1 addition, 12 deletionsindra/llaudio/llaudioengine.h
- indra/llcharacter/CMakeLists.txt 3 additions, 15 deletionsindra/llcharacter/CMakeLists.txt
- indra/llcharacter/llkeyframefallmotion.cpp 5 additions, 0 deletionsindra/llcharacter/llkeyframefallmotion.cpp
- indra/llcharacter/llkeyframemotion.cpp 7 additions, 14 deletionsindra/llcharacter/llkeyframemotion.cpp
- indra/llcharacter/llkeyframemotion.h 1 addition, 11 deletionsindra/llcharacter/llkeyframemotion.h
Loading
Please register or sign in to comment