diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-12-18 14:10:02 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-12-18 14:10:02 -0800 |
| commit | 909e4097433ab8e84a19e2119a9ecf05b3eebe64 (patch) | |
| tree | fe11439e42d20f1f2eae81e772c68b0d9fdb2692 /indra/CMakeLists.txt | |
| parent | b98469bd7db06973e6058118551e500dc094d3c0 (diff) | |
| parent | 6dd80980cfa5be214c143d125cfabd006ea7ebff (diff) | |
Merge
Diffstat (limited to 'indra/CMakeLists.txt')
| -rwxr-xr-x | indra/CMakeLists.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 10692402a5..133c5ee265 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -57,12 +57,6 @@ add_subdirectory(${VIEWER_PREFIX}test) if (ENABLE_MEDIA_PLUGINS) # viewer media plugins add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins) - - # llplugin testbed code (is this the right way to include it?) - if (LL_TESTS AND NOT LINUX) - add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) - add_subdirectory(${VIEWER_PREFIX}test_apps/llfbconnecttest) - endif (LL_TESTS AND NOT LINUX) endif (ENABLE_MEDIA_PLUGINS) if (LINUX) |