diff options
| author | callum_linden <none@none> | 2015-03-24 00:42:42 +0100 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-03-24 00:42:42 +0100 |
| commit | ab9e83030671f0d309eada847af7055213dfe501 (patch) | |
| tree | 40f4ed2d4d84545dd9fad0b1e34969c6d2ffd4f0 /indra/llplugin | |
| parent | d3477b738881acbdf2bd1cc7bfaadaaae3890be6 (diff) | |
Refer to new QuickTime third party package with fixes for VS2013 & re-add QuickTime media plugin
Diffstat (limited to 'indra/llplugin')
| -rwxr-xr-x | indra/llplugin/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | indra/llplugin/slplugin/slplugin.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
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; } - |