Resolved Conflicts: indra/newview/llviewermedia.cpp indra/plugins/base_media/CMakeLists.txt Trivial fix for indra/newview/llviewermedia.cpp. Moved 'prepare' dependency from base_media to base_basic because media already depends on basic.