Automated merge with http://bitbucket.org/lindenlab/viewer-release
No related branches found
No related tags found
Showing
- .hgignore 3 additions, 1 deletion.hgignore
- autobuild.xml 8 additions, 8 deletionsautobuild.xml
- indra/cmake/00-Common.cmake 1 addition, 0 deletionsindra/cmake/00-Common.cmake
- indra/cmake/LLAddBuildTest.cmake 0 additions, 0 deletionsindra/cmake/LLAddBuildTest.cmake
- indra/integration_tests/llui_libtest/llui_libtest.cpp 2 additions, 2 deletionsindra/integration_tests/llui_libtest/llui_libtest.cpp
- indra/linux_crash_logger/linux_crash_logger.cpp 3 additions, 3 deletionsindra/linux_crash_logger/linux_crash_logger.cpp
- indra/linux_crash_logger/llcrashloggerlinux.cpp 1 addition, 1 deletionindra/linux_crash_logger/llcrashloggerlinux.cpp
- indra/linux_updater/linux_updater.cpp 36 additions, 34 deletionsindra/linux_updater/linux_updater.cpp
- indra/llappearance/llavatarappearance.cpp 99 additions, 99 deletionsindra/llappearance/llavatarappearance.cpp
- indra/llappearance/llavatarjoint.cpp 1 addition, 1 deletionindra/llappearance/llavatarjoint.cpp
- indra/llappearance/llavatarjointmesh.cpp 13 additions, 17 deletionsindra/llappearance/llavatarjointmesh.cpp
- indra/llappearance/llavatarjointmesh.h 0 additions, 1 deletionindra/llappearance/llavatarjointmesh.h
- indra/llappearance/lldriverparam.cpp 3 additions, 3 deletionsindra/llappearance/lldriverparam.cpp
- indra/llappearance/lldriverparam.h 1 addition, 0 deletionsindra/llappearance/lldriverparam.h
- indra/llappearance/lllocaltextureobject.cpp 1 addition, 1 deletionindra/llappearance/lllocaltextureobject.cpp
- indra/llappearance/llpolymesh.cpp 42 additions, 49 deletionsindra/llappearance/llpolymesh.cpp
- indra/llappearance/llpolymesh.h 1 addition, 2 deletionsindra/llappearance/llpolymesh.h
- indra/llappearance/llpolymorph.cpp 16 additions, 15 deletionsindra/llappearance/llpolymorph.cpp
- indra/llappearance/llpolyskeletaldistortion.cpp 12 additions, 19 deletionsindra/llappearance/llpolyskeletaldistortion.cpp
- indra/llappearance/llpolyskeletaldistortion.h 0 additions, 1 deletionindra/llappearance/llpolyskeletaldistortion.h
Loading
Please register or sign in to comment