diff --git a/doc/contributions.txt b/doc/contributions.txt
index 280781d8d1f3f656091793631d0c72feb818da4b..806d3ecb2c5785d646151c2699f58a34e6a2c87d 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -401,6 +401,7 @@ Jonathan Yap
 	STORM-980
 	VWR-17801
 	VWR-24347
+	STORM-977
 Kage Pixel
 	VWR-11
 Ken March
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 6d17a6f402efbf917fe8a24a51fa25fe70fbefb3..7ba43f4b134c7a12c7e3fbd69ec45894e1469d93 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -72,9 +72,9 @@ if (VIEWER)
   add_subdirectory(${LIBS_OPEN_PREFIX}media_plugins)
 
   # llplugin testbed code (is this the right way to include it?)
-  if (NOT LINUX)
+  if (LL_TESTS AND NOT LINUX)
     add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest)
-  endif (NOT LINUX)
+  endif (LL_TESTS AND NOT LINUX)
 
   if (LINUX)
     add_subdirectory(${VIEWER_PREFIX}linux_crash_logger)
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index b4043b0fd9cd892778cb66da7c248f93d1995a9c..02d7031b81834622d0fef264202556f2ccf43e3f 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -1,5 +1,4 @@
 # -*- cmake -*-
-
 project(llplugintest)
 
 include(00-Common)