diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-14 17:46:53 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-14 17:46:53 -0500 |
| commit | f125039abcb566eaa7bdf33ce9c8c550cc25783a (patch) | |
| tree | af4d577b9559855177bd0e24f95ee90976e6e8e0 /indra/newview/llappviewer.cpp | |
| parent | 4cc5f81ddf0b9a190235e8946d7e438499d91639 (diff) | |
| parent | 93f827ec7855c419c19dbf1a055e7cdc546eb650 (diff) | |
merge with avatar-pipeline
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9a1b749ba7..3250343b25 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -746,7 +746,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(); |