2 files changed, 10 insertions, 15 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 6fd259a..3dabb3b 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1547,19 +1547,7 @@ if (WINDOWS)
         COMMENT "Copying Quicktime Plugin to the runtime folder."
         )
 
-  # Copying the mime_types.xml file to app_settings
-  set(mime_types_source "${CMAKE_SOURCE_DIR}/newview/skins/default/xui/en-us")
-  set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings")
-  add_custom_command(
-      TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-      COMMAND ${CMAKE_COMMAND}
-      ARGS 
-         -E
-         copy_if_different
-         ${mime_types_source}/mime_types_windows.xml 
-         ${mime_types_dest}/mime_types.xml
-      COMMENT "Copying mime_types_windows.xml to mime_types.xml."
-      )
+
 
 endif (WINDOWS)
 
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index a9a6052..f422f33 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -707,8 +707,15 @@ bool LLAppViewer::init()
         LLViewerJointMesh::updateVectorize();
 
         // load MIME type -> media impl mappings
-        LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); 
-
+        std::string mime_types_name;
+#if LL_DARWIN
+        mime_types_name = "mime_types_mac.xml";
+#elif LL_LINUX
+        mime_types_name = "mime_types_linux.xml";
+#else
+        mime_types_name = "mime_types.xml";
+#endif
+        LLMIMETypes::parseMIMETypes( mime_types_name ); 
 
         // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
         settings_to_globals();