Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saner MIME type handling

Browse Source
This commit is contained in:
Siana Gearz
2011-07-03 19:38:00 +02:00
parent f2a9dbe065
commit 08589058c2
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llappviewer.cpp
View File

@@ -679,7 +679,13 @@ bool LLAppViewer::init()
LLViewerJointMesh::updateVectorize(); LLViewerJointMesh::updateVectorize();
// load MIME type -> media impl mappings // load MIME type -> media impl mappings
LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); #if LL_WINDOWS
LLMIMETypes::parseMIMETypes( std::string("mime_types_windows.xml") );
#elif LL_DARWIN
LLMIMETypes::parseMIMETypes( std::string("mime_types_mac.xml") );
#elif LL_LINUX
LLMIMETypes::parseMIMETypes( std::string("mime_types_linux.xml") );
#endif
// Copy settings to globals. *TODO: Remove or move to appropriage class initializers // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
settings_to_globals(); settings_to_globals();

12
indra/newview/viewer_manifest.py
View File

@@ -85,9 +85,6 @@ class ViewerManifest(LLManifest):
self.path("*.png") self.path("*.png")
self.path("textures.xml") self.path("textures.xml")
self.end_prefix("default/textures") self.end_prefix("default/textures")
self.exclude("default/xui/en_us/mime_types_windows.xml")
self.exclude("default/xui/en_us/mime_types_mac.xml")
self.exclude("default/xui/en_us/mime_types_linux.xml")
self.path("default/xui/*/*.xml") self.path("default/xui/*/*.xml")
self.path("Default.xml") self.path("Default.xml")
self.path("default/*.xml") self.path("default/*.xml")
@@ -269,9 +266,6 @@ class WindowsManifest(ViewerManifest):
self.path("qtwcodecs4.dll") self.path("qtwcodecs4.dll")
self.end_prefix() self.end_prefix()
# Per platform MIME config on the cheap. See SNOW-307 / DEV-41388
self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml")
# Get llcommon and deps. If missing assume static linkage and continue. # Get llcommon and deps. If missing assume static linkage and continue.
if self.prefix(src=self.args['configuration'], dst=""): if self.prefix(src=self.args['configuration'], dst=""):
try: try:
@@ -555,9 +549,6 @@ class DarwinManifest(ViewerManifest):
self.end_prefix("llplugin") self.end_prefix("llplugin")
# Per platform MIME config on the cheap. See SNOW-307 / DEV-41388
self.path("skins/default/xui/en-us/mime_types_mac.xml", "skins/default/xui/en-us/mime_types.xml")
# command line arguments for connecting to the proper grid # command line arguments for connecting to the proper grid
self.put_in_file(self.flags_list(), 'arguments.txt') self.put_in_file(self.flags_list(), 'arguments.txt')
@@ -710,9 +701,6 @@ class LinuxManifest(ViewerManifest):
self.path("../plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so") self.path("../plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so")
self.end_prefix("bin/llplugin") self.end_prefix("bin/llplugin")
# Per platform MIME config on the cheap. See SNOW-307 / DEV-41388
self.path("skins/default/xui/en-us/mime_types_linux.xml", "skins/default/xui/en-us/mime_types.xml")
self.path("featuretable_linux.txt") self.path("featuretable_linux.txt")
def wrapper_name(self): def wrapper_name(self):