-
- Downloads
Merge branch 'master' (DRTVWR-543) into DRTVWR-559
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
No related branches found
No related tags found
Showing
- autobuild.xml 139 additions, 946 deletionsautobuild.xml
- doc/contributions.txt 4 additions, 2 deletionsdoc/contributions.txt
- indra/CMakeLists.txt 6 additions, 1 deletionindra/CMakeLists.txt
- indra/cmake/00-Common.cmake 0 additions, 1 deletionindra/cmake/00-Common.cmake
- indra/cmake/APR.cmake 2 additions, 3 deletionsindra/cmake/APR.cmake
- indra/cmake/BerkeleyDB.cmake 0 additions, 17 deletionsindra/cmake/BerkeleyDB.cmake
- indra/cmake/Boost.cmake 24 additions, 51 deletionsindra/cmake/Boost.cmake
- indra/cmake/CMakeLists.txt 2 additions, 4 deletionsindra/cmake/CMakeLists.txt
- indra/cmake/FindBerkeleyDB.cmake 0 additions, 50 deletionsindra/cmake/FindBerkeleyDB.cmake
- indra/cmake/FindZLIBNG.cmake 46 additions, 0 deletionsindra/cmake/FindZLIBNG.cmake
- indra/cmake/LLAppearanceUtility.cmake 0 additions, 2 deletionsindra/cmake/LLAppearanceUtility.cmake
- indra/cmake/LLCommon.cmake 1 addition, 1 deletionindra/cmake/LLCommon.cmake
- indra/cmake/LLPrimitive.cmake 4 additions, 1 deletionindra/cmake/LLPrimitive.cmake
- indra/cmake/ZLIBNG.cmake 10 additions, 10 deletionsindra/cmake/ZLIBNG.cmake
- indra/doxygen/CMakeLists.txt 1 addition, 1 deletionindra/doxygen/CMakeLists.txt
- indra/lib/python/indra/util/llmanifest.py 1 addition, 2 deletionsindra/lib/python/indra/util/llmanifest.py
- indra/llappearance/lltexlayer.cpp 0 additions, 26 deletionsindra/llappearance/lltexlayer.cpp
- indra/llappearance/lltexlayer.h 0 additions, 2 deletionsindra/llappearance/lltexlayer.h
- indra/llcommon/CMakeLists.txt 8 additions, 6 deletionsindra/llcommon/CMakeLists.txt
- indra/llcommon/classic_callback.cpp 16 additions, 0 deletionsindra/llcommon/classic_callback.cpp
Loading
Please register or sign in to comment