diff options
| author | richard <none@none> | 2009-12-14 14:35:24 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-14 14:35:24 -0800 |
| commit | 861640adf90809131210175368850d0ccc1d669e (patch) | |
| tree | 186582ebb54a61cd8055f45fa59a56b3963675be /indra/newview/llappviewer.cpp | |
| parent | 2313867f9be1f6365d754c417a4807384a915263 (diff) | |
| parent | 7f0e7a1fed2caa29b9950e3e5a638ba379a67de5 (diff) | |
merge
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 13754eb06d..90b8cd9572 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -745,7 +745,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(); |