From 95b044a5c6efac08471ccda8647df6165fb7cbdf Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Thu, 10 Dec 2009 16:03:39 -0800 Subject: 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. --- indra/newview/llappviewer.cpp | 10 +- .../skins/default/xui/en/mime_types_linux.xml | 442 +++++++++++++++++++++ .../skins/default/xui/en/mime_types_mac.xml | 442 +++++++++++++++++++++ indra/newview/viewer_manifest.py | 2 +- 4 files changed, 894 insertions(+), 2 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/mime_types_linux.xml create mode 100644 indra/newview/skins/default/xui/en/mime_types_mac.xml 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(); diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml new file mode 100644 index 0000000000..05cd850725 --- /dev/null +++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml @@ -0,0 +1,442 @@ + + + + (Unknown) + + + none + + + media_plugin_webkit + + + + + icn_media_web.tga + + + text/html + + + This location has Web content + + + Show Web content + + + true + + + false + + + + + + video/* + + + icn_media_movie.tga + + + There is a movie to play here + + + Play movie + + + false + + + true + + + + + + icn_media_web.tga + + + image/* + + + There is an image at this location + + + View this location's image + + + false + + + false + + + + + + icn_media_web.tga + + + audio/* + + + There is audio at this location + + + Play this location's audio + + + false + + + true + + + + + + movie + + + media_plugin_gstreamer + + + + + + none + + + media_plugin_gstreamer + + + + + + none + + + + + + audio + + + + + + movie + + + + + + image + + + + + + movie + + + media_plugin_gstreamer + + + + + + web + + + + + + audio + + + + + + image + + + + + + image + + + + + + image + + + + + + movie + + + + + + web + + + + + + image + + + + + + audio + + + media_plugin_gstreamer + + + + + + audio + + + media_plugin_gstreamer + + + + + + audio + + + media_plugin_gstreamer + + + + + + audio + + + media_plugin_gstreamer + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + web + + + media_plugin_webkit + + + + + + text + + + media_plugin_webkit + + + + + + text + + + media_plugin_webkit + + + + + + movie + + + media_plugin_gstreamer + + + + + + movie + + + media_plugin_gstreamer + + + + + + movie + + + media_plugin_gstreamer + + + + + + movie + + + media_plugin_gstreamer + + + + + + movie + + + media_plugin_gstreamer + + + + + + movie + + + media_plugin_gstreamer + + + diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml new file mode 100644 index 0000000000..76c0d027f3 --- /dev/null +++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml @@ -0,0 +1,442 @@ + + + + (Unknown) + + + none + + + media_plugin_webkit + + + + + icn_media_web.tga + + + text/html + + + This location has Web content + + + Show Web content + + + true + + + false + + + + + + video/* + + + icn_media_movie.tga + + + There is a movie to play here + + + Play movie + + + false + + + true + + + + + + icn_media_web.tga + + + image/* + + + There is an image at this location + + + View this location's image + + + false + + + false + + + + + + icn_media_web.tga + + + audio/* + + + There is audio at this location + + + Play this location's audio + + + false + + + true + + + + + + movie + + + media_plugin_quicktime + + + + + + none + + + media_plugin_quicktime + + + + + + none + + + + + + audio + + + + + + movie + + + + + + image + + + + + + movie + + + media_plugin_quicktime + + + + + + web + + + + + + audio + + + + + + image + + + + + + image + + + + + + image + + + + + + movie + + + + + + web + + + + + + image + + + + + + audio + + + media_plugin_quicktime + + + + + + audio + + + media_plugin_quicktime + + + + + + audio + + + media_plugin_quicktime + + + + + + audio + + + media_plugin_quicktime + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + image + + + media_plugin_webkit + + + + + + web + + + media_plugin_webkit + + + + + + text + + + media_plugin_webkit + + + + + + text + + + media_plugin_webkit + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + + + + movie + + + media_plugin_quicktime + + + diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4133315480..32fdd41be2 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -803,7 +803,7 @@ class Linux_i686Manifest(LinuxManifest): # plugins if self.prefix(src="", dst="bin/llplugin"): self.path("../media_plugins/webkit/libmedia_plugin_webkit.so", "libmedia_plugin_webkit.so") - self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_quicktime.so") + self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so") self.end_prefix("bin/llplugin") self.path("featuretable_linux.txt") -- cgit v1.2.3