Automated merge with ssh://bitbucket.org/lindenlab/viewer64

autobuild.xml

indra/cmake/LLAddBuildTest.cmake

indra/cmake/LibVLCPlugin.cmake

indra/llmath/CMakeLists.txt

indra/llmath/lloctree.cpp

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llrender/llgl.cpp

indra/llui/CMakeLists.txt

indra/llui/llfloater.cpp

indra/llui/tests/llurlentry_test.cpp

indra/media_plugins/CMakeLists.txt

indra/media_plugins/cef/CMakeLists.txt

indra/media_plugins/cef/media_plugin_cef.cpp

indra/media_plugins/libvlc/media_plugin_libvlc.cpp

indra/newview/CMakeLists.txt

indra/newview/llspatialpartition.cpp

indra/newview/skins/default/xui/en/mime_types_mac.xml

indra/newview/viewer_manifest.py