diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-14 15:07:16 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-14 15:07:16 +0200 |
| commit | f493b62f868f5fb8fe8d9f7e0f5b0ff619eb8026 (patch) | |
| tree | 2d337bacabec046e3c9f7e82d6e1c59f350af410 /indra/newview/llappviewer.cpp | |
| parent | f446e2b94d05315a09e3068b258a606986ec8872 (diff) | |
| parent | a763409647a5a8d82f2f1c54223b998877c3b72d (diff) | |
Merge from default branch.
--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(); |