summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <none@none>2015-03-26 18:37:51 +0100
committercallum_linden <none@none>2015-03-26 18:37:51 +0100
commit9e43798e899a0a337d53ac1fa5a1984d3dfeb0f1 (patch)
tree156dbc64c0d1f20748f36fabd0b868585271e7cf /indra
parent834a94caec7691a957c0816f38ac00d765fa5021 (diff)
Remove standlone media plugin and fb connect test apps while we transition to CEF
Diffstat (limited to 'indra')
-rwxr-xr-xindra/CMakeLists.txt5
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)