diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-14 17:11:15 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-14 17:11:15 +0200 |
| commit | c1b31cd97accfbd67f12ffbdff41f61ba9a01843 (patch) | |
| tree | e13a5e68523f6ee2889b8eaf81a8bdc81844a77a /indra/newview/llappviewer.cpp | |
| parent | 222dfaef0aa16ced2fd6285763467e5bfa8ed574 (diff) | |
| parent | c159d9165dda268f3d8d16e95dac81bc8a9e12be (diff) | |
merge
--HG--
branch : product-engine
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 2fc7a630ae..58b36a85dc 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -744,7 +744,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(); |