MIME type fix for media

This commit is contained in:
Siana Gearz
2011-07-02 19:39:31 +02:00
parent fa790523d9
commit af9259e626

View File

@@ -678,9 +678,6 @@ bool LLAppViewer::init()
LLViewerJointMesh::updateVectorize();
// load MIME type -> media impl mappings
LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") );
// Copy settings to globals. *TODO: Remove or move to appropriage class initializers
settings_to_globals();
// Setup settings listeners
@@ -2393,6 +2390,9 @@ bool LLAppViewer::initWindow()
LLTrans::parseStrings("strings.xml");
LLUITrans::parseStrings("ui_strings.xml");
// load MIME type -> media impl mappings
LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") );
// Show watch cursor
gViewerWindow->setCursor(UI_CURSOR_WAIT);