diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-29 06:19:06 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-29 06:19:06 +0100 |
| commit | 33a0e1d07bb90117b60d5f79f0cdd3529ec595da (patch) | |
| tree | 6cea69c52dccf3ed3f5e0e77f80aa77f8ad88e9f /indra/newview/CMakeLists.txt | |
| parent | 6387426c990ad32623d57ad7fa190d78b2d5dbb6 (diff) | |
| parent | 3df90898b18feeda876857acb00f1f3046793e69 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 128d67d73d..50d1491523 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -275,6 +275,7 @@ set(viewer_SOURCE_FILES lllogchat.cpp llloginhandler.cpp lllogininstance.cpp + llmachineid.cpp llmanip.cpp llmaniprotate.cpp llmanipscale.cpp @@ -792,6 +793,7 @@ set(viewer_HEADER_FILES lllogchat.h llloginhandler.h lllogininstance.h + llmachineid.h llmanip.h llmaniprotate.h llmanipscale.h @@ -1841,7 +1843,7 @@ if (LL_TESTS) ) LL_ADD_INTEGRATION_TEST(llsechandler_basic - llsechandler_basic.cpp + llsechandler_basic.cpp "${test_libs}" ) |