aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--linden/indra/newview/CMakeLists.txt4
-rw-r--r--linden/indra/newview/llappviewer.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index bec20d9..6596d39 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1584,8 +1584,8 @@ if (WINDOWS)
1584 -E 1584 -E
1585 copy_if_different 1585 copy_if_different
1586 ${mime_types_source}/mime_types_windows.xml 1586 ${mime_types_source}/mime_types_windows.xml
1587 ${mime_types_dest}/mime_types.xml 1587 ${mime_types_dest}/mime_types_windows.xml
1588 COMMENT "Copying mime_types_windows.xml to mime_types.xml." 1588 COMMENT "Copying mime_types_windows.xml to the runtime app_settings folder."
1589 ) 1589 )
1590 1590
1591endif (WINDOWS) 1591endif (WINDOWS)
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 5b34e82..97deca0 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -724,7 +724,7 @@ bool LLAppViewer::init()
724#elif LL_LINUX 724#elif LL_LINUX
725 mime_types_name = "mime_types_linux.xml"; 725 mime_types_name = "mime_types_linux.xml";
726#else 726#else
727 mime_types_name = "mime_types.xml"; 727 mime_types_name = "mime_types_windows.xml";
728#endif 728#endif
729 LLMIMETypes::parseMIMETypes( mime_types_name ); 729 LLMIMETypes::parseMIMETypes( mime_types_name );
730 730