Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

58a500be

Commit 58a500be authored 3 years ago by Andrey Lihatskiy

Downloads
- Plain Diff

Merge branch 'master' into DRTVWR-561-maint-O

parents 2242f089 cdbd06e8

No related branches found

No related tags found

1 merge request!83Merge Linden 6.6.7

Changes 428

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
autobuild.xml 122 additions, 96 deletions

autobuild.xml
build.sh 10 additions, 2 deletions

build.sh
doc/contributions.txt 3 additions, 1 deletion

doc/contributions.txt
indra/CMakeLists.txt 1 addition, 0 deletions

indra/CMakeLists.txt
indra/cmake/00-Common.cmake 10 additions, 5 deletions

indra/cmake/00-Common.cmake
indra/cmake/CMakeLists.txt 2 additions, 1 deletion

indra/cmake/CMakeLists.txt
indra/cmake/Copy3rdPartyLibs.cmake 3 additions, 3 deletions

indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/GLOD.cmake 0 additions, 11 deletions

indra/cmake/GLOD.cmake
indra/cmake/LLCommon.cmake 4 additions, 1 deletion

indra/cmake/LLCommon.cmake
indra/cmake/LLMeshOptimizer.cmake 7 additions, 0 deletions

indra/cmake/LLMeshOptimizer.cmake
indra/cmake/MESHOPTIMIZER.cmake 16 additions, 0 deletions

indra/cmake/MESHOPTIMIZER.cmake
indra/cmake/Tracy.cmake 29 additions, 0 deletions

indra/cmake/Tracy.cmake
indra/edit-me-to-trigger-new-build.txt 1 addition, 0 deletions

indra/edit-me-to-trigger-new-build.txt
indra/lib/python/indra/util/llmanifest.py 43 additions, 0 deletions

indra/lib/python/indra/util/llmanifest.py
indra/llappearance/llavatarappearance.cpp 1 addition, 1 deletion

indra/llappearance/llavatarappearance.cpp
indra/llappearance/lldriverparam.h 52 additions, 62 deletions

indra/llappearance/lldriverparam.h
indra/llappearance/llpolymorph.cpp 1 addition, 3 deletions

indra/llappearance/llpolymorph.cpp
indra/llappearance/llpolymorph.h 5 additions, 24 deletions

indra/llappearance/llpolymorph.h
indra/llappearance/llpolyskeletaldistortion.cpp 1 addition, 3 deletions

indra/llappearance/llpolyskeletaldistortion.cpp

with 312 additions and 213 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment