Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

1777fa51

Commit 1777fa51 authored 12 years ago by simon@Simon-PC.lindenlab.com

Downloads
- Plain Diff

Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148

parents 78f2663c ee66cb3e

No related branches found

No related tags found

No related merge requests found

Changes 422

Hide whitespace changes

Inline Side-by-side

Showing

.hgignore 2 additions, 0 deletions

.hgignore
.hgtags 16 additions, 3 deletions

.hgtags
BuildParams 32 additions, 0 deletions

BuildParams
autobuild.xml 12 additions, 12 deletions

autobuild.xml
build.sh 10 additions, 8 deletions

build.sh
doc/contributions.txt 9 additions, 2 deletions

doc/contributions.txt
indra/CMakeLists.txt 0 additions, 1 deletion

indra/CMakeLists.txt
indra/cmake/JsonCpp.cmake 1 addition, 1 deletion

indra/cmake/JsonCpp.cmake
indra/cmake/LLTestCommand.cmake 3 additions, 0 deletions

indra/cmake/LLTestCommand.cmake
indra/cmake/Linking.cmake 9 additions, 2 deletions

indra/cmake/Linking.cmake
indra/cmake/VisualLeakDetector.cmake 15 additions, 0 deletions

indra/cmake/VisualLeakDetector.cmake
indra/cmake/WebKitLibPlugin.cmake 4 additions, 3 deletions

indra/cmake/WebKitLibPlugin.cmake
indra/cmake/run_build_test.py 29 additions, 1 deletion

indra/cmake/run_build_test.py
indra/edit-me-to-trigger-new-build.txt 0 additions, 0 deletions

indra/edit-me-to-trigger-new-build.txt
indra/integration_tests/llimage_libtest/llimage_libtest.cpp 60 additions, 8 deletions

indra/integration_tests/llimage_libtest/llimage_libtest.cpp
indra/integration_tests/llui_libtest/CMakeLists.txt 0 additions, 2 deletions

indra/integration_tests/llui_libtest/CMakeLists.txt
indra/lib/python/indra/util/llmanifest.py 33 additions, 13 deletions

indra/lib/python/indra/util/llmanifest.py
indra/linux_updater/CMakeLists.txt 3 additions, 3 deletions

indra/linux_updater/CMakeLists.txt
indra/llcommon/CMakeLists.txt 19 additions, 4 deletions

indra/llcommon/CMakeLists.txt
indra/llcommon/llerror.cpp 3 additions, 3 deletions

indra/llcommon/llerror.cpp

with 260 additions and 66 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