diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-14 10:39:59 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-14 10:39:59 -0500 |
| commit | aad8d99af2b4a29d055dccb1c3fbea7a46fcb843 (patch) | |
| tree | 96b398bd405344f42753e58afbb02092882715cb /indra/newview/llappviewer.cpp | |
| parent | 3e75137f26c099185677e1160570860e07a56595 (diff) | |
| parent | a763409647a5a8d82f2f1c54223b998877c3b72d (diff) | |
automated merge viewer2.0->viewer2.0
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(); |