From ab9e83030671f0d309eada847af7055213dfe501 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Tue, 24 Mar 2015 00:42:42 +0100
Subject: Refer to new QuickTime third party package with fixes for VS2013 &
 re-add QuickTime media plugin

---
 indra/llplugin/CMakeLists.txt        | 2 +-
 indra/llplugin/slplugin/slplugin.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/llplugin')

diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 05fc12e338..75d89aac78 100755
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -68,7 +68,7 @@ list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
 
 add_library (llplugin ${llplugin_SOURCE_FILES})
 
-##add_subdirectory(slplugin)
+add_subdirectory(slplugin)
 
 # Add tests
 if (LL_TESTS)
diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp
index 6c9ba0ae52..684bcf1207 100755
--- a/indra/llplugin/slplugin/slplugin.cpp
+++ b/indra/llplugin/slplugin/slplugin.cpp
@@ -310,4 +310,3 @@ int main(int argc, char **argv)
 
 	return 0;
 }
-
-- 
cgit v1.3