diff options
| author | callum_linden <none@none> | 2015-03-28 01:50:01 +0100 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-03-28 01:50:01 +0100 |
| commit | d214c2854110520d5574f675bcc12f64bfd42090 (patch) | |
| tree | 7c36c9a785751db9daef770a99c6182ce419b00a /indra | |
| parent | efffc4b0748d1fe950f46aaafe3ded679536d934 (diff) | |
| parent | 9e43798e899a0a337d53ac1fa5a1984d3dfeb0f1 (diff) | |
Merge with head
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 10692402a5..2d45bc938e 100755 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -60,8 +60,9 @@ 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) + #removed during webkit -> cef update + #add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest) + #add_subdirectory(${VIEWER_PREFIX}test_apps/llfbconnecttest) endif (LL_TESTS AND NOT LINUX) endif (ENABLE_MEDIA_PLUGINS) |