diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 3a668ffa5..cbaf571b5 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -39,7 +39,7 @@ option(UNATTENDED "Disable use of uneeded tooling for automated builds" OFF)
 
 # Media Plugins
 option(ENABLE_MEDIA_PLUGINS "Turn off building media plugins if they are imported by third-party library mechanism" ON)
-option(LIBVLCPLUGIN "Turn off building support for libvlc plugin" ON)
+option(LIBVLCPLUGIN "Turn off building support for libvlc plugin" OFF)
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(LIBVLCPLUGIN OFF)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 7f3c5ea97..3ad3c2565 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1529,7 +1529,7 @@ void LLVOVolume::regenFaces()
 
 BOOL LLVOVolume::genBBoxes(BOOL force_global)
 {
-	BOOL res = TRUE;
+	bool res = true;
 
 	LLVector4a min,max;