diff options
| author | McCabe Maxsted | 2010-10-27 02:56:22 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-27 09:46:48 -0700 |
| commit | 190bd7d2b622efda788a7b1e7da5996c5095de54 (patch) | |
| tree | 89a7b2e8be80c6edb1241b60ec816a8ccea9dbe2 /linden/indra | |
| parent | Use quicktime instead of gstreamer on Windows (diff) | |
| download | meta-impy-190bd7d2b622efda788a7b1e7da5996c5095de54.zip meta-impy-190bd7d2b622efda788a7b1e7da5996c5095de54.tar.gz meta-impy-190bd7d2b622efda788a7b1e7da5996c5095de54.tar.bz2 meta-impy-190bd7d2b622efda788a7b1e7da5996c5095de54.tar.xz | |
Load mime_types_windows.xml instead of mime_types.xml so we can fallback on the version in the skins directory correctly
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | linden/indra/newview/llappviewer.cpp | 2 |
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 | ||
| 1591 | endif (WINDOWS) | 1591 | endif (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 | ||