diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-12-10 16:03:39 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-12-10 16:03:39 -0800 |
| commit | 95b044a5c6efac08471ccda8647df6165fb7cbdf (patch) | |
| tree | 6ece3b8a3427db1bb2d8a12a81e0ac955eccb02e /indra/newview/llappviewer.cpp | |
| parent | 8eb2f3bd0fb0860105b71c45dc473f684b03438e (diff) | |
Fix for DEV-41388 (SNOW-307: Linux viewer builds renames gstreamer plugin to quicktime.)
Of the four options suggested in the jira, this is a modified version of #2. Since the mime_types.xml file actually gets localized (it contains a bunch of user-visible text in addition to the mappings), I don't think renaming it in viewer_manifest.py will work.
Instead, I've created additional files (mime_types_linux.xml and mime_types_mac.xml) in the same location, and changed the code that loads the file in LLAppViewer::init() to look for different names per-platform.
I'm sure there are cleverer solutions (such as abusing the translation xml overlay system to create files that have deltas per platform), but those don't fit in the time-box allocated to this issue.
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 508badcc6f..0c8c7e21a3 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(); |